diff --git a/public/app/plugins/datasource/influxdb/components/editor/config/ConfigEditor.tsx b/public/app/plugins/datasource/influxdb/components/editor/config/ConfigEditor.tsx
index 95f26dcac5e..f5e91daa356 100644
--- a/public/app/plugins/datasource/influxdb/components/editor/config/ConfigEditor.tsx
+++ b/public/app/plugins/datasource/influxdb/components/editor/config/ConfigEditor.tsx
@@ -121,7 +121,7 @@ export class ConfigEditor extends PureComponent<Props, State> {
       case InfluxVersion.SQL:
         return <InfluxSqlConfig {...this.props} />;
       default:
-        return null;
+        return <InfluxInfluxQLConfig {...this.props} />;
     }
   }