diff --git a/src/panel/graph_panel/graph_ctrl.ts b/src/panel/graph_panel/graph_ctrl.ts
index c9b6292..a25a61c 100644
--- a/src/panel/graph_panel/graph_ctrl.ts
+++ b/src/panel/graph_panel/graph_ctrl.ts
@@ -645,7 +645,10 @@ class GraphCtrl extends MetricsPanelCtrl {
   }
 
   async onAnalyticUnitSave(analyticUnit: AnalyticUnit) {
-    if(this.analyticsController.labelingUnit.id === analyticUnit.id) {
+    if(
+      this.analyticsController.labelingUnit !== null && 
+      this.analyticsController.labelingUnit.id === analyticUnit.id
+    ) {
       await this.onToggleLabelingMode(analyticUnit.id)
     }
     await this.analyticsController.saveAnalyticUnit(analyticUnit);