diff --git a/client/app/components/queries/query-editor.js b/client/app/components/queries/query-editor.js
index 770bc4b48c..665f4776ff 100644
--- a/client/app/components/queries/query-editor.js
+++ b/client/app/components/queries/query-editor.js
@@ -119,7 +119,7 @@ function queryEditor(QuerySnippet) {
                   newSchema.reduce((totalLength, table) => totalLength + table.columns.length, 0);
                 // If there are too many tokens we disable live autocomplete,
                 // as it makes typing slower.
-                if (tokensCount > 5000) {
+                if (tokensCount > 5000 || !$scope.$parent.editorAutocomplete) {
                   editor.setOption('enableLiveAutocompletion', false);
                   editor.setOption('enableBasicAutocompletion', false);
                 } else {
@@ -132,6 +132,10 @@ function queryEditor(QuerySnippet) {
             $scope.$parent.$on('angular-resizable.resizing', () => {
               editor.resize();
             });
+            $scope.$parent.$watch('editorAutocomplete', () => {
+              editor.setOption('enableLiveAutocompletion', $scope.$parent.editorAutocomplete);
+              editor.setOption('enableBasicAutocompletion', $scope.$parent.editorAutocomplete);
+            });
 
             editor.focus();
           },
diff --git a/client/app/pages/queries/query.html b/client/app/pages/queries/query.html
index ac4a9476c5..bf42da0d7d 100644
--- a/client/app/pages/queries/query.html
+++ b/client/app/pages/queries/query.html
@@ -107,6 +107,10 @@ <h3>
               <span ng-if="dataSource.options.doc_url == '' || !dataSource.options.doc_url">{{ dataSource.type_name }} documentation</span>
               <get-data-source-version id='data-source-version'></get-data-source-version>
 
+              <input type="checkbox" ng-model="editorAutocomplete">
+                Enable Autocomplete
+              </button>
+
               <div class="pull-right">
                 <button class="btn btn-s btn-default" ng-click="togglePublished()" ng-if="query.is_draft && query.id != undefined && (isQueryOwner || currentUser.hasPermission('admin'))">
                   <span class="fa fa-paper-plane"></span> Publish
diff --git a/client/app/pages/queries/source-view.js b/client/app/pages/queries/source-view.js
index 7572c73f26..d140678a31 100644
--- a/client/app/pages/queries/source-view.js
+++ b/client/app/pages/queries/source-view.js
@@ -71,6 +71,8 @@ function QuerySourceCtrl(
       .catch(error => toastr.error(error));
   };
 
+  $scope.editorAutocomplete = true;
+
   $scope.duplicateQuery = () => {
     Query.fork({ id: $scope.query.id }, (newQuery) => {
       $location.url(newQuery.getSourceLink()).replace();