diff --git a/public/app/plugins/datasource/influxdb/components/editor/query/influxql/visual/VisualInfluxQLEditor.tsx b/public/app/plugins/datasource/influxdb/components/editor/query/influxql/visual/VisualInfluxQLEditor.tsx
index 3be9072d27f..9ef1616cdbf 100644
--- a/public/app/plugins/datasource/influxdb/components/editor/query/influxql/visual/VisualInfluxQLEditor.tsx
+++ b/public/app/plugins/datasource/influxdb/components/editor/query/influxql/visual/VisualInfluxQLEditor.tsx
@@ -55,7 +55,7 @@ export const VisualInfluxQLEditor = (props: Props): JSX.Element => {
   const { retentionPolicies } = useRetentionPolicies(datasource);
 
   useEffect(() => {
-    if (!policy) {
+    if (!policy && retentionPolicies.length > 0) {
       props.onChange({
         ...query,
         policy: retentionPolicies[0],