diff --git a/frontend/src/v5/ui/components/viewer/drawingViewer/viewerLayer2D/camera/viewer.hooks.ts b/frontend/src/v5/ui/components/viewer/drawingViewer/viewerLayer2D/camera/viewer.hooks.ts
index 4ed76625ac..13d71f052b 100644
--- a/frontend/src/v5/ui/components/viewer/drawingViewer/viewerLayer2D/camera/viewer.hooks.ts
+++ b/frontend/src/v5/ui/components/viewer/drawingViewer/viewerLayer2D/camera/viewer.hooks.ts
@@ -22,7 +22,14 @@ export const useModelLoading = () => {
 	const [loading, setLoading] = useState(true);
 
 	useEffect(() => {
-		ViewerService.isModelReady().then(() => setLoading(false));
+		let mounted = true;
+
+		ViewerService.isModelReady().then(() => {
+			if (!mounted) return;
+			setLoading(false);
+		});
+
+		return () => {mounted = false;};
 	}, []);
 
 	return loading;