diff --git a/armarx_setup/core/workspace/workspace.py b/armarx_setup/core/workspace/workspace.py
index 25d9bd497ce938312187d4f3881f1cc151d28d27..01de64d0b3c60d6e685666eb1b53667299616c8d 100644
--- a/armarx_setup/core/workspace/workspace.py
+++ b/armarx_setup/core/workspace/workspace.py
@@ -103,7 +103,13 @@ class Workspace:
 
         workspace_os_fingerprint = os.environ.get(AXII_WORKSPACE_OS_FINGERPRINT, None)
         actual_os_fingerprint = axii_config.get_os_codename()
-        if workspace_os_fingerprint is not None and workspace_os_fingerprint != actual_os_fingerprint:
+
+        # TODO: Remove this hotfix after 2024-03-01.  By then it should be safe to remove as Axii will update the OS
+        # fingerprints.
+        if workspace_os_fingerprint == "unknown":
+            print(f"Workspace was previously built with an unknown operating system.  If you didn't change the "
+                  f"operating system, you can safely ignore this message.")
+        elif workspace_os_fingerprint is not None and workspace_os_fingerprint != actual_os_fingerprint:
             raise error.WorkspaceWasBuiltWithOtherOS(workspace_os_fingerprint=workspace_os_fingerprint,
                                                      actual_os_fingerprint=actual_os_fingerprint)