diff --git a/WEB/Controller/PartieGateway.php b/WEB/Controller/PartieGateway.php
index 0e983213..1230cc56 100644
--- a/WEB/Controller/PartieGateway.php
+++ b/WEB/Controller/PartieGateway.php
@@ -66,7 +66,8 @@ class PartieGateway
         $query = "SELECT p.id
         FROM Partie p, Participer pa
         WHERE pa.etat=0
-        AND pa.partie=p.id";
+        AND pa.partie=p.id
+        LIMIT 1";
         $this->con->executeQuery($query);
         $results = $this->con->getResults();
         return $results[0]['id'];
diff --git a/WEB/Controller/UserController.php b/WEB/Controller/UserController.php
index 1fbc508b..15f2a79f 100644
--- a/WEB/Controller/UserController.php
+++ b/WEB/Controller/UserController.php
@@ -205,12 +205,10 @@ class UserController
             require($rep . $vues['queue']);
             $model = new UserModel();
             $model->addToQueue();
+            $usergroup = $model->findUserGroup();
             echo
-                '<script>
-            socket.on("launchGame", () => {
-                launchGame();
-              });
-            io.to($userGroup).emit("launchGame");
+            '<script>
+                io.to($userGroup).emit("launchGame");
             <script/>';
         } catch (Exception $e) {
             $error = $e->getMessage();
diff --git a/WEB/Model/UserModel.php b/WEB/Model/UserModel.php
index 13bf2a35..001bc976 100644
--- a/WEB/Model/UserModel.php
+++ b/WEB/Model/UserModel.php
@@ -57,6 +57,10 @@ class UserModel
         </script>';
     }
 
+        public function findUserGroup() : int {
+            return $this->partie_gateway->findPartieInQueue();
+        }
+
     public function launchGame()
     {
             $this->utilisateur_gateway->launchGame($_SESSION['utilisateur']);