diff --git a/frontend/src/pages/WorkspaceSettings/AgentConfig/AgentModelSelection/index.jsx b/frontend/src/pages/WorkspaceSettings/AgentConfig/AgentModelSelection/index.jsx
index c6ec0ca22bfe679020e3cb450af457ba17e29bbc..bf51cb87eea8e8a904b9ff2ae1f2e7927c1f99b6 100644
--- a/frontend/src/pages/WorkspaceSettings/AgentConfig/AgentModelSelection/index.jsx
+++ b/frontend/src/pages/WorkspaceSettings/AgentConfig/AgentModelSelection/index.jsx
@@ -5,15 +5,11 @@ import useGetProviderModels, {
 // These models do NOT support function calling
 function supportedModel(provider, model = "") {
   if (provider !== "openai") return true;
-  if (model.startsWith("gpt-3.5-turbo")) return true;
-  switch (model) {
-    case "gpt-4":
-    case "gpt-4-turbo-preview":
-    case "gpt-4-32k":
-      return true;
-    default:
-      return false;
-  }
+  return (
+    ["gpt-3.5-turbo-0301", "gpt-4-turbo-2024-04-09", "gpt-4-turbo"].includes(
+      model
+    ) === false
+  );
 }
 
 export default function AgentModelSelection({