diff --git a/public/app/plugins/datasource/influxdb/components/editor/query/fsql/FSQLEditor.tsx b/public/app/plugins/datasource/influxdb/components/editor/query/fsql/FSQLEditor.tsx
index 041e5933bd8..6d4a092fafb 100644
--- a/public/app/plugins/datasource/influxdb/components/editor/query/fsql/FSQLEditor.tsx
+++ b/public/app/plugins/datasource/influxdb/components/editor/query/fsql/FSQLEditor.tsx
@@ -6,6 +6,7 @@ import { Alert, InlineFormLabel, LinkButton, Themeable2, withTheme2 } from '@gra
 
 import { SQLQuery } from '../../../../../../../features/plugins/sql';
 import { SqlQueryEditor } from '../../../../../../../features/plugins/sql/components/QueryEditor';
+import { applyQueryDefaults } from '../../../../../../../features/plugins/sql/defaults';
 import InfluxDatasource from '../../../../datasource';
 import { InfluxQuery } from '../../../../types';
 
@@ -55,8 +56,13 @@ class UnthemedSQLQueryEditor extends PureComponent<Props> {
   }
 
   transformQuery(query: InfluxQuery & SQLQuery): SQLQuery {
+    const defaultQuery = applyQueryDefaults(query);
     return {
-      ...query,
+      ...defaultQuery,
+      sql: {
+        ...defaultQuery.sql,
+        limit: undefined,
+      },
     };
   }