diff --git a/web/ui/react-app/src/pages/graph/Panel.tsx b/web/ui/react-app/src/pages/graph/Panel.tsx
index 501ab67c9..f60812a50 100644
--- a/web/ui/react-app/src/pages/graph/Panel.tsx
+++ b/web/ui/react-app/src/pages/graph/Panel.tsx
@@ -194,7 +194,8 @@ class Panel extends Component<PanelProps, PanelState> {
       }
 
       const isHeatmap = isHeatmapData(query.data);
-      if (!isHeatmap) {
+      const isHeatmapDisplayMode = this.props.options.displayMode === GraphDisplayMode.Heatmap;
+      if (!isHeatmap && isHeatmapDisplayMode) {
         this.setOptions({ displayMode: GraphDisplayMode.Lines });
       }