diff --git a/frontend/src/components/app-config/data-form.tsx b/frontend/src/components/app-config/data-form.tsx
index ba47055b2e0..cba0242de13 100644
--- a/frontend/src/components/app-config/data-form.tsx
+++ b/frontend/src/components/app-config/data-form.tsx
@@ -2,7 +2,6 @@
 
 import type { ChangeEvent } from "react";
 import type { FieldPath, UseFormReturn } from "react-hook-form";
-import { Checkbox } from "@/components/ui/checkbox";
 import {
   FormControl,
   FormDescription,
@@ -213,7 +212,8 @@ export const DataForm = ({
           {renderDiscoveryForm("datasources.auto_discover_columns", "Columns")}
         </div>
 
-        <FormField
+        {/* TODO: Issue with frontend being stuck */}
+        {/* <FormField
           control={form.control}
           name="diagnostics.sql_linter"
           render={({ field }) => (
@@ -238,7 +238,7 @@ export const DataForm = ({
               </FormDescription>
             </div>
           )}
-        />
+        /> */}
 
         <FormField
           control={form.control}
diff --git a/frontend/src/core/codemirror/language/languages/sql/sql.ts b/frontend/src/core/codemirror/language/languages/sql/sql.ts
index a9b4e88e0e6..e4a14c0685b 100644
--- a/frontend/src/core/codemirror/language/languages/sql/sql.ts
+++ b/frontend/src/core/codemirror/language/languages/sql/sql.ts
@@ -168,7 +168,8 @@ export class SQLLanguageAdapter
       }),
     ];
 
-    const sqlLinterEnabled = lspConfig?.diagnostics?.sql_linter ?? false;
+    // TODO: Issue with frontend being stuck
+    const sqlLinterEnabled = false;
 
     if (sqlLinterEnabled) {
       const theme = store.get(resolvedThemeAtom);