diff --git a/webapp/src/components/modalComponents/calibrationWizardComponents/cameraCalibrationSteps/cameraMainCalibrationStep.vue b/webapp/src/components/modalComponents/calibrationWizardComponents/cameraCalibrationSteps/cameraMainCalibrationStep.vue
index e393eead..0656597f 100644
--- a/webapp/src/components/modalComponents/calibrationWizardComponents/cameraCalibrationSteps/cameraMainCalibrationStep.vue
+++ b/webapp/src/components/modalComponents/calibrationWizardComponents/cameraCalibrationSteps/cameraMainCalibrationStep.vue
@@ -6,7 +6,11 @@
 
     <template #below-stream>
       <div class="action-button-container">
-        <cameraCalibrationSettings :show-extra-settings="false" :camera-uri="cameraUri" />
+        <cameraCalibrationSettings
+          :show-extra-settings="false"
+          :camera-uri="cameraUri"
+          @actionFinished="checkCalibrationState"
+        />
       </div>
     </template>
   </stepTemplateWithStream>
@@ -29,6 +33,17 @@ export default {
       return `${this.$store.getters.baseUri}/camera/`;
     },
   },
+
+  mounted() {
+    this.checkCalibrationState();
+  },
+
+  methods: {
+    async checkCalibrationState() {
+      const needsCal = await this.readThingProperty("camera", "calibration_required");
+      this.$emit("awaiting-user", needsCal);
+    },
+  },
 };
 </script>
 
diff --git a/webapp/src/components/tabContentComponents/settingsComponents/cameraSettingsComponents/cameraCalibrationSettings.vue b/webapp/src/components/tabContentComponents/settingsComponents/cameraSettingsComponents/cameraCalibrationSettings.vue
index 9bc847de..710897e8 100644
--- a/webapp/src/components/tabContentComponents/settingsComponents/cameraSettingsComponents/cameraCalibrationSettings.vue
+++ b/webapp/src/components/tabContentComponents/settingsComponents/cameraSettingsComponents/cameraCalibrationSettings.vue
@@ -6,7 +6,7 @@
       :key="'primary_cal' + index"
       class="uk-child-width-expand"
     >
-      <server-specified-action-button :action-data="action" />
+      <server-specified-action-button :action-data="action" @finished="$emit('actionFinished')" />
     </div>
     <div v-if="showExtraSettings">
       <div
@@ -14,7 +14,7 @@
         :key="'secondary_cal' + index"
         class="uk-child-width-expand"
       >
-        <server-specified-action-button :action-data="action" />
+        <server-specified-action-button :action-data="action" @finished="$emit('actionFinished')" />
       </div>
     </div>
   </div>