diff --git a/src/backend/ssh/tunnel.ts b/src/backend/ssh/tunnel.ts
index 4580ef6c..205278b0 100644
--- a/src/backend/ssh/tunnel.ts
+++ b/src/backend/ssh/tunnel.ts
@@ -1937,6 +1937,7 @@ app.post(
     }
 
     const tunnelName = tunnelConfig.name;
+    tunnelConfig.requestingUserId = userId;
 
     try {
       if (!validateTunnelConfig(tunnelName, tunnelConfig)) {
@@ -1967,10 +1968,6 @@ app.post(
           });
           return res.status(403).json({ error: "Access denied to this host" });
         }
-
-        if (accessInfo.isShared && !accessInfo.isOwner) {
-          tunnelConfig.requestingUserId = userId;
-        }
       }
 
       if (pendingTunnelOperations.has(tunnelName)) {