diff --git a/app/server/appsmith-plugins/anthropicPlugin/src/main/java/com/external/plugins/commands/ChatCommand.java b/app/server/appsmith-plugins/anthropicPlugin/src/main/java/com/external/plugins/commands/ChatCommand.java
index 8b78c1a96d..5349d68f1a 100644
--- a/app/server/appsmith-plugins/anthropicPlugin/src/main/java/com/external/plugins/commands/ChatCommand.java
+++ b/app/server/appsmith-plugins/anthropicPlugin/src/main/java/com/external/plugins/commands/ChatCommand.java
@@ -24,8 +24,6 @@ import static com.external.plugins.constants.AnthropicConstants.CHAT;
 import static com.external.plugins.constants.AnthropicConstants.CHAT_MODEL_SELECTOR;
 import static com.external.plugins.constants.AnthropicConstants.CLOUD_SERVICES;
 import static com.external.plugins.constants.AnthropicConstants.COMMAND;
-import static com.external.plugins.constants.AnthropicConstants.COMPONENT;
-import static com.external.plugins.constants.AnthropicConstants.COMPONENT_DATA;
 import static com.external.plugins.constants.AnthropicConstants.CONTENT;
 import static com.external.plugins.constants.AnthropicConstants.DATA;
 import static com.external.plugins.constants.AnthropicConstants.DEFAULT_MAX_TOKEN;
@@ -130,31 +128,20 @@ public class ChatCommand implements AnthropicCommand {
         }
     }
 
+    /**
+     * When JS is enabled in form component, value is stored in data key only. Difference is if viewType is json,
+     * it's stored as JSON string otherwise it's Java serialized object
+     */
     private List<Map<String, String>> getMessages(Map<String, Object> messages) {
         Type listType = new TypeToken<List<Map<String, String>>>() {}.getType();
-        if (messages.containsKey(VIEW_TYPE)) {
-            if (JSON.equals(messages.get(VIEW_TYPE))) {
-                // data is present in data key as String
-                return gson.fromJson((String) messages.get(DATA), listType);
-            } else if (COMPONENT.equals(messages.get(VIEW_TYPE))) {
-                return (List<Map<String, String>>) messages.get(COMPONENT_DATA);
-            }
+        if (messages.containsKey(VIEW_TYPE) && JSON.equals(messages.get(VIEW_TYPE))) {
+            // data is present in data key as String
+            return gson.fromJson((String) messages.get(DATA), listType);
         }
         // return object stored in data key
         return (List<Map<String, String>>) messages.get(DATA);
     }
 
-    /**
-     * Finds right data key from formData.messages. If viewType is present and it's json, then use `componentData`key
-     * else use `data` key to find right messages.
-     */
-    private String findDataKey(Map<String, Object> messages) {
-        if (messages.containsKey(VIEW_TYPE) && "json".equals(messages.get(VIEW_TYPE))) {
-            return COMPONENT_DATA;
-        }
-        return DATA;
-    }
-
     private int getMaxTokenFromFormData(Map<String, Object> formData) {
         String maxTokenAsString = RequestUtils.extractValueFromFormData(formData, MAX_TOKENS);
 
diff --git a/app/server/appsmith-plugins/googleAiPlugin/src/main/java/com/external/plugins/commands/GenerateContentCommand.java b/app/server/appsmith-plugins/googleAiPlugin/src/main/java/com/external/plugins/commands/GenerateContentCommand.java
index 5850609648..e90201bc1e 100644
--- a/app/server/appsmith-plugins/googleAiPlugin/src/main/java/com/external/plugins/commands/GenerateContentCommand.java
+++ b/app/server/appsmith-plugins/googleAiPlugin/src/main/java/com/external/plugins/commands/GenerateContentCommand.java
@@ -19,8 +19,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import static com.external.plugins.constants.GoogleAIConstants.COMPONENT;
-import static com.external.plugins.constants.GoogleAIConstants.COMPONENT_DATA;
 import static com.external.plugins.constants.GoogleAIConstants.CONTENT;
 import static com.external.plugins.constants.GoogleAIConstants.DATA;
 import static com.external.plugins.constants.GoogleAIConstants.GENERATE_CONTENT_MODEL;
@@ -136,15 +134,15 @@ public class GenerateContentCommand implements GoogleAICommand {
         }
     }
 
+    /**
+     * When JS is enabled in form component, value is stored in data key only. Difference is if viewType is json,
+     * it's stored as JSON string otherwise it's Java serialized object
+     */
     private List<Map<String, String>> getMessages(Map<String, Object> messages) {
         Type listType = new TypeToken<List<Map<String, String>>>() {}.getType();
-        if (messages.containsKey(VIEW_TYPE)) {
-            if (JSON.equals(messages.get(VIEW_TYPE))) {
-                // data is present in data key as String
-                return gson.fromJson((String) messages.get(DATA), listType);
-            } else if (COMPONENT.equals(messages.get(VIEW_TYPE))) {
-                return (List<Map<String, String>>) messages.get(COMPONENT_DATA);
-            }
+        if (messages.containsKey(VIEW_TYPE) && JSON.equals(messages.get(VIEW_TYPE))) {
+            // data is present in data key as String
+            return gson.fromJson((String) messages.get(DATA), listType);
         }
         // return object stored in data key
         return (List<Map<String, String>>) messages.get(DATA);