diff --git a/webapp/src/components/modalComponents/calibrationModal.vue b/webapp/src/components/modalComponents/calibrationModal.vue
index 7f6d40db..a612a021 100644
--- a/webapp/src/components/modalComponents/calibrationModal.vue
+++ b/webapp/src/components/modalComponents/calibrationModal.vue
@@ -201,16 +201,16 @@ export default {
     show: async function() {
       // Check if the camera and stage are calibrated, if they can be
       if (this.canCSMCalibrated) {
-        /*let csm = this.readThingProperty(
+        let csm = await this.readThingProperty(
           "camera_stage_mapping",
           "image_to_stage_displacement_matrix",
           true
         );
-        this.isCSMCalibrated = Boolean(csm);*/
+        this.isCSMCalibrated = Boolean(csm);
       }
       if (this.canLSTCalibrated) {
-        this.isLSTCalibrated = this.readThingProperty(
-          "picamera",
+        this.isLSTCalibrated = await this.readThingProperty(
+          "camera",
           "lens_shading_is_static"
         );
       }
diff --git a/webapp/src/components/tabContentComponents/settingsComponents/CSMSettingsComponents/CSMCalibrationSettings.vue b/webapp/src/components/tabContentComponents/settingsComponents/CSMSettingsComponents/CSMCalibrationSettings.vue
index f1bbace1..db5fc10b 100644
--- a/webapp/src/components/tabContentComponents/settingsComponents/CSMSettingsComponents/CSMCalibrationSettings.vue
+++ b/webapp/src/components/tabContentComponents/settingsComponents/CSMSettingsComponents/CSMCalibrationSettings.vue
@@ -63,7 +63,7 @@ export default {
   methods: {
     getCalibrationData: async function() {
       try {
-        let data = this.readThingProperty(
+        let data = await this.readThingProperty(
           "camera_stage_mapping",
           "last_calibration"
         );