diff --git a/src/Prospect.Server.Api/Services/CloudScript/Functions/TryGetCompleteSquadInfo.cs b/src/Prospect.Server.Api/Services/CloudScript/Functions/TryGetCompleteSquadInfo.cs
index 4103827..2f8b508 100644
--- a/src/Prospect.Server.Api/Services/CloudScript/Functions/TryGetCompleteSquadInfo.cs
+++ b/src/Prospect.Server.Api/Services/CloudScript/Functions/TryGetCompleteSquadInfo.cs
@@ -71,11 +71,13 @@ public class TryGetCompleteSquadInfoFunction : ICloudScriptFunction<TryGetComple
             throw new CloudScriptException("CloudScript was not called within a http request");
         }
         var userId = context.User.FindAuthUserId();
-        var squad = _squadService.GetByUser(userId)
-            // Solo : on matérialise un squad d'un membre (soi-même) pour renvoyer la
-            // liste des cartes débloquées, sinon le client n'en voit aucune et déploie
-            // toujours sur la 1re map.
-            ?? _squadService.JoinOrCreate(userId, userId, "");
+        var squad = _squadService.GetByUser(userId);
+        if (squad == null)
+        {
+            // Solo : pas de squad → squad vide (NE PAS matérialiser un squad, sinon le
+            // client passe en matchmaking de groupe et « attend d'autres joueurs »).
+            return Task.FromResult(new FYPlayFabSquad());
+        }
         _logger.LogInformation("TryGetCompleteSquadInfo: user {User} in squad {Squad} ({Count} member(s))", userId, squad.SquadId, squad.Members.Count);
         return Task.FromResult(_squadService.ToClientSquad(squad));
     }
diff --git a/src/Prospect.Server.Api/Services/Squad/SquadService.cs b/src/Prospect.Server.Api/Services/Squad/SquadService.cs
index 50fdbb4..f866610 100644
--- a/src/Prospect.Server.Api/Services/Squad/SquadService.cs
+++ b/src/Prospect.Server.Api/Services/Squad/SquadService.cs
@@ -97,7 +97,7 @@ public class SquadService
                     selectedMapName = m.SelectedMap,
                     isSecretLeader = m.IsLeader,
                 },
-                mapRowNamesUnlocked = AllMapRows,
+                mapRowNamesUnlocked = Array.Empty<string>(),
             }).ToArray(),
         };
     }