diff --git a/frontend/src/hooks/useGetProvidersModels.js b/frontend/src/hooks/useGetProvidersModels.js
index 5c8171b3c08f57722b3e9d40e91b42b7a92e8890..051c97ed79e062b2f857f6d66d7f361e94333353 100644
--- a/frontend/src/hooks/useGetProvidersModels.js
+++ b/frontend/src/hooks/useGetProvidersModels.js
@@ -7,6 +7,7 @@ export const DISABLED_PROVIDERS = [
   "lmstudio",
   "native",
   "textgenwebui",
+  "generic-openai",
 ];
 const PROVIDER_DEFAULT_MODELS = {
   openai: [],
@@ -46,6 +47,7 @@ const PROVIDER_DEFAULT_MODELS = {
     "command-light-nightly",
   ],
   textgenwebui: [],
+  "generic-openai": [],
 };
 
 // For togetherAi, which has a large model list - we subgroup the options
diff --git a/frontend/src/pages/WorkspaceSettings/AgentConfig/AgentLLMSelection/index.jsx b/frontend/src/pages/WorkspaceSettings/AgentConfig/AgentLLMSelection/index.jsx
index ac507e92986e4c69f9c09422d71543078f9ba3ac..2ff4fb8d7fe05585f3d4531cadda3282e0aa21b6 100644
--- a/frontend/src/pages/WorkspaceSettings/AgentConfig/AgentLLMSelection/index.jsx
+++ b/frontend/src/pages/WorkspaceSettings/AgentConfig/AgentLLMSelection/index.jsx
@@ -20,8 +20,8 @@ const ENABLED_PROVIDERS = [
   "mistral",
   "perplexity",
   "textgenwebui",
+  "generic-openai",
   // TODO: More agent support.
-  // "generic-openai", // Need to support text-input for agent model input for this to be enabled.
   // "cohere",         // Has tool calling and will need to build explicit support
   // "huggingface"     // Can be done but already has issues with no-chat templated. Needs to be tested.
   // "gemini",         // Too rate limited and broken in several ways to use for agents.