diff --git a/public/app/features/explore/Explore.tsx b/public/app/features/explore/Explore.tsx
index d03bb3ab11f..4e4a569d8e2 100644
--- a/public/app/features/explore/Explore.tsx
+++ b/public/app/features/explore/Explore.tsx
@@ -312,7 +312,8 @@ export class Explore extends React.PureComponent<ExploreProps, ExploreState> {
     const isLoading = queryResponse.state === LoadingState.Loading;
 
     // gets an error without a refID, so non-query-row-related error, like a connection error
-    const queryErrors = queryResponse.error ? [queryResponse.error] : undefined;
+    const queryErrors =
+      queryResponse.state === LoadingState.Error && queryResponse.error ? [queryResponse.error] : undefined;
     const queryError = getFirstNonQueryRowSpecificError(queryErrors);
 
     const showRichHistory = openDrawer === ExploreDrawer.RichHistory;
diff --git a/public/app/features/explore/__snapshots__/Explore.test.tsx.snap b/public/app/features/explore/__snapshots__/Explore.test.tsx.snap
index 1b67a99f918..501de41bab2 100644
--- a/public/app/features/explore/__snapshots__/Explore.test.tsx.snap
+++ b/public/app/features/explore/__snapshots__/Explore.test.tsx.snap
@@ -37,9 +37,7 @@ exports[`Explore should render component 1`] = `
         richHistoryButtonActive={false}
       />
     </div>
-    <ErrorContainer
-      queryError={Object {}}
-    />
+    <ErrorContainer />
     <AutoSizer
       disableHeight={true}
       disableWidth={false}
diff --git a/public/app/features/explore/state/query.ts b/public/app/features/explore/state/query.ts
index 6439544764d..90015ba561f 100644
--- a/public/app/features/explore/state/query.ts
+++ b/public/app/features/explore/state/query.ts
@@ -657,7 +657,7 @@ export const processQueryResponse = (
 
     return {
       ...state,
-      loading: false,
+      loading: loadingState === LoadingState.Loading || loadingState === LoadingState.Streaming,
       queryResponse: response,
       graphResult: null,
       tableResult: null,