diff --git a/RealityMixer/Calibration/Model/CalibrationResult.swift b/RealityMixer/Calibration/Model/CalibrationResult.swift
index 11e11d2..5f818b9 100644
--- a/RealityMixer/Calibration/Model/CalibrationResult.swift
+++ b/RealityMixer/Calibration/Model/CalibrationResult.swift
@@ -20,7 +20,7 @@ extension CalibrationResult {
         """
         <?xml version="1.0"?>
         <opencv_storage>
-            <camera_id>1</camera_id>
+            <camera_id>\(UUID().uuidString)</camera_id>
             <camera_name>Reality Mixer Camera</camera_name>
             <image_width>\(imageSize.width)</image_width>
             <image_height>\(imageSize.height)</image_height>
diff --git a/RealityMixer/Calibration/ViewControllers/CalibrationViewController.swift b/RealityMixer/Calibration/ViewControllers/CalibrationViewController.swift
index 48d883d..47aa837 100644
--- a/RealityMixer/Calibration/ViewControllers/CalibrationViewController.swift
+++ b/RealityMixer/Calibration/ViewControllers/CalibrationViewController.swift
@@ -290,6 +290,9 @@ extension CalibrationViewController: OculusCalibrationDelegate {
     }
 
     func oculusCalibration(_ oculusCalibration: OculusCalibration, didReceiveCalibrationXMLString xmlString: String) {
+        // Trying to erase any previous calibration
+        let data = CalibrationFrame(payloadType: PayloadType.clearCalibration.rawValue, data: Data()).toData()
+        _ = client.send(data: data)
     }
 }