diff --git a/ui/src/data_explorer/actions/view/index.js b/ui/src/data_explorer/actions/view/index.js
index f01d120e0a..fb8daa06a0 100644
--- a/ui/src/data_explorer/actions/view/index.js
+++ b/ui/src/data_explorer/actions/view/index.js
@@ -4,10 +4,10 @@ import {getQueryConfig} from 'shared/apis'
 
 import {errorThrown} from 'shared/actions/errors'
 
-export const addQuery = () => ({
+export const addQuery = (queryID = uuid.v4()) => ({
   type: 'DE_ADD_QUERY',
   payload: {
-    queryID: uuid.v4(),
+    queryID,
   },
 })
 
diff --git a/ui/src/data_explorer/containers/DataExplorer.js b/ui/src/data_explorer/containers/DataExplorer.js
index 25d2408982..8ddc15376c 100644
--- a/ui/src/data_explorer/containers/DataExplorer.js
+++ b/ui/src/data_explorer/containers/DataExplorer.js
@@ -36,7 +36,9 @@ class DataExplorer extends Component {
     const {queryConfigs} = this.props
 
     if (queryConfigs.length === 0) {
-      queryConfigs.push(defaultQueryConfig())
+      const qc = defaultQueryConfig()
+      this.props.queryConfigActions.addQuery(qc.id)
+      queryConfigs.push(qc)
     }
 
     return queryConfigs[0]