diff --git a/debye_bec/bec_widgets/widgets/data_viewer/data_viewer.py b/debye_bec/bec_widgets/widgets/data_viewer/data_viewer.py
index 184a475..e1c930d 100644
--- a/debye_bec/bec_widgets/widgets/data_viewer/data_viewer.py
+++ b/debye_bec/bec_widgets/widgets/data_viewer/data_viewer.py
@@ -178,8 +178,11 @@ class DataViewer(BECWidget, QWidget):
             scan_data = self.client.history[-n].metadata["bec"]  # type: ignore
             scan_number = scan_data["scan_number"]
             scan_name = scan_data["scan_name"]
-            comment = scan_data["metadata"]["user_metadata"]["comment"]
-            sample_name = scan_data["metadata"]["user_metadata"]["sample_name"]
+            if "metadata" in scan_data:
+                comment = scan_data["metadata"]["user_metadata"]["comment"]
+                sample_name = scan_data["metadata"]["user_metadata"]["sample_name"]
+            else:
+                comment, sample_name = "", ""
             status = scan_data["status"]
             self.history.append(
                 {