diff --git a/frontend/src/v5/store/drawings/drawings.helpers.tsx b/frontend/src/v5/store/drawings/drawings.helpers.tsx
index 47a91031ba..562301a388 100644
--- a/frontend/src/v5/store/drawings/drawings.helpers.tsx
+++ b/frontend/src/v5/store/drawings/drawings.helpers.tsx
@@ -121,7 +121,7 @@ export const fullDrawing = (
 	const status = drawing.status ?? UploadStatus.OK;
 	const isFavourite = drawing.isFavourite ?? false;
 	const role = drawing.role ?? Role.ADMIN;
-	const calibration = drawing.calibration || EMPTY_CALIBRATION;
+	const calibration = { ...EMPTY_CALIBRATION, ...drawing.calibration };
 
 	return {
 		...drawing,
diff --git a/frontend/src/v5/store/drawings/drawings.selectors.ts b/frontend/src/v5/store/drawings/drawings.selectors.ts
index b9f5a89ecd..63d9ea9fa0 100644
--- a/frontend/src/v5/store/drawings/drawings.selectors.ts
+++ b/frontend/src/v5/store/drawings/drawings.selectors.ts
@@ -28,7 +28,7 @@ import { isEqual, orderBy } from 'lodash';
 import { Vector2 } from 'three';
 import { fullDrawing } from './drawings.helpers';
 import { selectRevisionsByDrawing } from './revisions/drawingRevisions.selectors';
-import { Calibration, CalibrationStatus } from './drawings.types';
+import { Calibration } from './drawings.types';
 
 const selectDrawingsDomain = (state): DrawingsState => state?.drawings || ({ drawingsByProjectByProject: {} });
 
@@ -58,11 +58,6 @@ export const selectDrawingById = createSelector(
 	(drawings, _id) => drawings.find((d) => d._id === _id),
 );
 
-export const selectDrawingCalibration = createSelector(
-	selectDrawingById,
-	(drawing) => drawing.calibrationStatus ?? CalibrationStatus.EMPTY,
-);
-
 export const selectIsListPending = createSelector(
 	selectDrawingsDomain, selectCurrentProject,
 	// Checks if the drawings for the project have been fetched
@@ -105,7 +100,7 @@ export const selectCalibration = createSelector(
 	selectDrawingById,
 	(state, drawingId, modelId) => selectContainerById(state, modelId) || selectFederationById(state, modelId),
 	(drawing, model) => {
-		const calibration = drawing?.calibration || EMPTY_CALIBRATION;
+		const calibration = { ...EMPTY_CALIBRATION, ...drawing?.calibration };
 		const conversionFactor = getUnitsConversionFactor(calibration.units, model.unit);
 		const horizontalCalibration = calibration.horizontal;