diff --git a/public/app/features/explore/Explore.tsx b/public/app/features/explore/Explore.tsx
index 437b50db63c..a28776d813a 100644
--- a/public/app/features/explore/Explore.tsx
+++ b/public/app/features/explore/Explore.tsx
@@ -205,28 +205,34 @@ export class Explore extends React.PureComponent<ExploreProps> {
             <div className="explore-container">
               <QueryRows exploreEvents={this.exploreEvents} exploreId={exploreId} queryKeys={queryKeys} />
               <AutoSizer onResize={this.onResize} disableHeight>
-                {({ width }) => (
-                  <main className="m-t-2" style={{ width }}>
-                    <ErrorBoundary>
-                      {showingStartPage && <StartPage onClickExample={this.onClickExample} />}
-                      {!showingStartPage && (
-                        <>
-                          {supportsGraph && !supportsLogs && <GraphContainer width={width} exploreId={exploreId} />}
-                          {supportsTable && <TableContainer exploreId={exploreId} onClickCell={this.onClickLabel} />}
-                          {supportsLogs && (
-                            <LogsContainer
-                              exploreId={exploreId}
-                              onChangeTime={this.onChangeTime}
-                              onClickLabel={this.onClickLabel}
-                              onStartScanning={this.onStartScanning}
-                              onStopScanning={this.onStopScanning}
-                            />
-                          )}
-                        </>
-                      )}
-                    </ErrorBoundary>
-                  </main>
-                )}
+                {({ width }) => {
+                  if (width === 0) {
+                    return null;
+                  }
+
+                  return (
+                    <main className="m-t-2" style={{ width }}>
+                      <ErrorBoundary>
+                        {showingStartPage && <StartPage onClickExample={this.onClickExample} />}
+                        {!showingStartPage && (
+                          <>
+                            {supportsGraph && !supportsLogs && <GraphContainer width={width} exploreId={exploreId} />}
+                            {supportsTable && <TableContainer exploreId={exploreId} onClickCell={this.onClickLabel} />}
+                            {supportsLogs && (
+                              <LogsContainer
+                                exploreId={exploreId}
+                                onChangeTime={this.onChangeTime}
+                                onClickLabel={this.onClickLabel}
+                                onStartScanning={this.onStartScanning}
+                                onStopScanning={this.onStopScanning}
+                              />
+                            )}
+                          </>
+                        )}
+                      </ErrorBoundary>
+                    </main>
+                  );
+                }}
               </AutoSizer>
             </div>
           )}