diff --git a/components/server/src/workspace/workspace-starter.ts b/components/server/src/workspace/workspace-starter.ts
index 7984001102d64e..d1ef806f1e378d 100644
--- a/components/server/src/workspace/workspace-starter.ts
+++ b/components/server/src/workspace/workspace-starter.ts
@@ -1424,7 +1424,7 @@ export class WorkspaceStarter {
         }
 
         const volumeSnapshotId =
-            SnapshotContext.is(workspace.context) || WithPrebuild.is(workspace.context)
+((SnapshotContext.is(workspace.context) || WithPrebuild.is(workspace.context)) && !!workspace.context.snapshotBucketId)
                 ? workspace.context.snapshotBucketId
                 : lastValidWorkspaceInstanceId;