diff --git a/components/ws-daemon/pkg/content/hooks.go b/components/ws-daemon/pkg/content/hooks.go
index 46a371d4ee5025..f1d10365a430f3 100644
--- a/components/ws-daemon/pkg/content/hooks.go
+++ b/components/ws-daemon/pkg/content/hooks.go
@@ -26,15 +26,15 @@ func workspaceLifecycleHooks(cfg Config, kubernetesNamespace string, workspaceEx
 
 	return map[session.WorkspaceState][]session.WorkspaceLivecycleHook{
 		session.WorkspaceInitializing: {
-			hookSetupRemoteStorage(cfg),
 			hookSetupWorkspaceLocation,
+			startIWS, // workspacekit is waiting for starting IWS, so it needs to start as soon as possible.
+			hookSetupRemoteStorage(cfg),
 			hookInstallQuota(xfs),
-			startIWS,
 		},
 		session.WorkspaceReady: {
+			startIWS,
 			hookSetupRemoteStorage(cfg),
 			hookInstallQuota(xfs),
-			startIWS,
 		},
 		session.WorkspaceDisposed: {
 			iws.StopServingWorkspace,