diff --git a/public/app/features/dashboard/panel_editor/QueryInspector.tsx b/public/app/features/dashboard/panel_editor/QueryInspector.tsx
index 25c3c68e21e..a72fbdb7e8f 100644
--- a/public/app/features/dashboard/panel_editor/QueryInspector.tsx
+++ b/public/app/features/dashboard/panel_editor/QueryInspector.tsx
@@ -39,14 +39,20 @@ export class QueryInspector extends PureComponent<Props, State> {
 
   componentDidMount() {
     const { panel } = this.props;
-    panel.events.on('refresh', this.onPanelRefresh);
+
     appEvents.on('ds-request-response', this.onDataSourceResponse);
+    appEvents.on('ds-request-error', this.onRequestError);
+
+    panel.events.on('refresh', this.onPanelRefresh);
     panel.refresh();
   }
 
   componentWillUnmount() {
     const { panel } = this.props;
+
     appEvents.off('ds-request-response', this.onDataSourceResponse);
+    appEvents.on('ds-request-error', this.onRequestError);
+
     panel.events.off('refresh', this.onPanelRefresh);
   }
 
@@ -73,6 +79,10 @@ export class QueryInspector extends PureComponent<Props, State> {
     }));
   };
 
+  onRequestError = (err: any) => {
+    this.onDataSourceResponse(err);
+  };
+
   onDataSourceResponse = (response: any = {}) => {
     if (this.state.isMocking) {
       this.handleMocking(response);