diff --git a/bec_widgets/widgets/plots/heatmap/heatmap.py b/bec_widgets/widgets/plots/heatmap/heatmap.py
index 22287ca3..041b1ef0 100644
--- a/bec_widgets/widgets/plots/heatmap/heatmap.py
+++ b/bec_widgets/widgets/plots/heatmap/heatmap.py
@@ -611,7 +611,7 @@ class Heatmap(ImageBase):
             scan_msg = self.scan_item.status_message
         elif hasattr(self.scan_item, "metadata"):
             metadata = self.scan_item.metadata["bec"]
-            status = metadata["exit_status"]
+            status = metadata["status"]
             scan_id = metadata["scan_id"]
             scan_name = metadata["scan_name"]
             scan_type = metadata["scan_type"]
diff --git a/bec_widgets/widgets/services/scan_history_browser/components/scan_history_metadata_viewer.py b/bec_widgets/widgets/services/scan_history_browser/components/scan_history_metadata_viewer.py
index 5f245517..5a9e610d 100644
--- a/bec_widgets/widgets/services/scan_history_browser/components/scan_history_metadata_viewer.py
+++ b/bec_widgets/widgets/services/scan_history_browser/components/scan_history_metadata_viewer.py
@@ -50,7 +50,7 @@ class ScanHistoryMetadataViewer(BECWidget, QtWidgets.QGroupBox):
             "start_time": "Start Time",
             "end_time": "End Time",
             "elapsed_time": "Elapsed Time",
-            "exit_status": "Status",
+            "status": "Status",
             "scan_name": "Scan Name",
             "num_points": "Nr of Points",
         }
diff --git a/tests/unit_tests/conftest.py b/tests/unit_tests/conftest.py
index 2e9b31c9..b5164ec7 100644
--- a/tests/unit_tests/conftest.py
+++ b/tests/unit_tests/conftest.py
@@ -222,7 +222,7 @@ def create_history_file(file_path, data: dict, metadata: dict) -> messages.ScanH
     msg = messages.ScanHistoryMessage(
         scan_id=metadata["scan_id"],
         scan_name=metadata["scan_name"],
-        exit_status=metadata["exit_status"],
+        exit_status=metadata["status"],
         file_path=file_path,
         scan_number=metadata["scan_number"],
         dataset_number=metadata["dataset_number"],
@@ -269,7 +269,7 @@ def grid_scan_history_msg(tmpdir):
         "scan_id": "test_scan",
         "scan_name": "grid_scan",
         "scan_type": "step",
-        "exit_status": "closed",
+        "status": "closed",
         "scan_number": 1,
         "dataset_number": 1,
         "request_inputs": {
@@ -349,7 +349,7 @@ def scan_history_factory(tmpdir):
             "scan_id": scan_id,
             "scan_name": scan_name,
             "scan_type": scan_type,
-            "exit_status": "closed",
+            "status": "closed",
             "scan_number": scan_number,
             "dataset_number": dataset_number,
             "request_inputs": {