diff --git a/public/app/features/explore/Explore.tsx b/public/app/features/explore/Explore.tsx
index 1c609897995..26884ec58dc 100644
--- a/public/app/features/explore/Explore.tsx
+++ b/public/app/features/explore/Explore.tsx
@@ -541,12 +541,7 @@ export class Explore extends React.PureComponent<ExploreProps, ExploreState> {
     const { datasource, range } = this.state;
     const { interval, intervalMs } = getIntervals(range, datasource, this.el.offsetWidth);
 
-    const configuredQueries = [
-      {
-        ...queryOptions,
-        ...query,
-      },
-    ];
+    const configuredQueries = [Object.assign(query, queryOptions)];
 
     // Clone range for query request
     // const queryRange: RawTimeRange = { ...range };
diff --git a/public/app/features/explore/QueryEditor.tsx b/public/app/features/explore/QueryEditor.tsx
index 0a4c0b78c3c..6fc1106576c 100644
--- a/public/app/features/explore/QueryEditor.tsx
+++ b/public/app/features/explore/QueryEditor.tsx
@@ -36,7 +36,7 @@ export default class QueryEditor extends PureComponent<QueryEditorProps, any> {
       target,
       ctrl: {
         refresh: () => {
-          this.props.onQueryChange({ refId: initialQuery.refId, ...target }, false);
+          this.props.onQueryChange(target, false);
           this.props.onExecuteQuery();
         },
         events: exploreEvents,