diff --git a/public/app/features/explore/Explore.tsx b/public/app/features/explore/Explore.tsx
index 590a5f645e2..d5f8bed7498 100644
--- a/public/app/features/explore/Explore.tsx
+++ b/public/app/features/explore/Explore.tsx
@@ -348,11 +348,13 @@ export class Explore extends React.PureComponent<ExploreProps, ExploreState> {
                     <ErrorBoundaryAlert>
                       {showPanels && (
                         <>
-                          {showMetrics && graphResult && this.renderGraphPanel(width)}
-                          {showTable && this.renderTablePanel(width)}
-                          {showLogs && this.renderLogsPanel(width)}
-                          {showNodeGraph && this.renderNodeGraphPanel()}
-                          {showTrace && this.renderTraceViewPanel()}
+                          {showMetrics && graphResult && (
+                            <ErrorBoundaryAlert>{this.renderGraphPanel(width)}</ErrorBoundaryAlert>
+                          )}
+                          {showTable && <ErrorBoundaryAlert>{this.renderTablePanel(width)}</ErrorBoundaryAlert>}
+                          {showLogs && <ErrorBoundaryAlert>{this.renderLogsPanel(width)}</ErrorBoundaryAlert>}
+                          {showNodeGraph && <ErrorBoundaryAlert>{this.renderNodeGraphPanel()}</ErrorBoundaryAlert>}
+                          {showTrace && <ErrorBoundaryAlert>{this.renderTraceViewPanel()}</ErrorBoundaryAlert>}
                         </>
                       )}
                       {showRichHistory && (