diff --git a/packages/web/src/query/AceEditor.svelte b/packages/web/src/query/AceEditor.svelte
index 735ce2a67..a7ef2e832 100644
--- a/packages/web/src/query/AceEditor.svelte
+++ b/packages/web/src/query/AceEditor.svelte
@@ -130,6 +130,7 @@
     currentEditorTheme,
     currentThemeDefinition,
     currentEditorKeybindigMode,
+    getCurrentSettings
   } from '../stores';
   import _ from 'lodash';
   import { handleCommandKeyDown } from '../commands/CommandListener.svelte';
@@ -212,11 +213,18 @@
         line: editor.getSelectionRange().start.row,
       };
     }
-    const line = editor.getSelectionRange().start.row;
+    if (!getCurrentSettings()['sqlEditor.disableExecuteCurrentLine']){
+      const line = editor.getSelectionRange().start.row;
+      return {
+        text: editor.session.getLine(line),
+        line,
+      };
+    }
+    
     return {
-      text: editor.session.getLine(line),
-      line,
+      text: editor.getValue(),
     };
+    
   }
 
   export function getCodeCompletionCommandText() {
diff --git a/packages/web/src/settings/SettingsModal.svelte b/packages/web/src/settings/SettingsModal.svelte
index 9b9b12147..a68f98941 100644
--- a/packages/web/src/settings/SettingsModal.svelte
+++ b/packages/web/src/settings/SettingsModal.svelte
@@ -258,6 +258,12 @@ ORDER BY
             label="Disable split by empty line"
             defaultValue={false}
           />
+
+          <FormCheckboxField
+            name="sqlEditor.disableExecuteCurrentLine"
+            label="Disable current line execution (Execute current)"
+            defaultValue={false}
+          />
         </svelte:fragment>
         <svelte:fragment slot="2">
           <div class="heading">Connection</div>