diff --git a/knockoutwhistweb/app/model/sessions/UserSession.scala b/knockoutwhistweb/app/model/sessions/UserSession.scala
index 64776fc..7e295e7 100644
--- a/knockoutwhistweb/app/model/sessions/UserSession.scala
+++ b/knockoutwhistweb/app/model/sessions/UserSession.scala
@@ -73,6 +73,8 @@ class UserSession(val user: User, val host: Boolean, val gameLobby: GameLobby) e
             case None =>
               println("Player ID not found or is not a valid UUID.")
           }
+        case "ReturnToLobby" =>
+          gameLobby.returnToLobby(this)
       }
     }
     lock.unlock()
diff --git a/knockoutwhistweb/app/views/ingame/finishedMatch.scala.html b/knockoutwhistweb/app/views/ingame/finishedMatch.scala.html
index 85fc7cf..bbb7f5b 100644
--- a/knockoutwhistweb/app/views/ingame/finishedMatch.scala.html
+++ b/knockoutwhistweb/app/views/ingame/finishedMatch.scala.html
@@ -10,7 +10,7 @@
         <div class="row justify-content-center align-items-center flex-grow-1">
         @if((gamelobby.getUserSession(user.get.id).host)) {
             <div class="col-12 text-center mb-5">
-                <div class="btn btn-success" onclick="backToLobby('@gamelobby.id')">Return to lobby</div>
+                <div class="btn btn-success" onclick="handleReturnToLobby()">Return to lobby</div>
             </div>
         } else {
             <div class="col-12 text-center mt-3">
diff --git a/knockoutwhistweb/public/javascripts/interact.js b/knockoutwhistweb/public/javascripts/interact.js
index f035832..59cdc4c 100644
--- a/knockoutwhistweb/public/javascripts/interact.js
+++ b/knockoutwhistweb/public/javascripts/interact.js
@@ -77,3 +77,6 @@ function handleKickPlayer(playerId) {
         playerId: playerId
     })
 }
+function handleReturnToLobby() {
+    sendEvent("ReturnToLobby")
+}
\ No newline at end of file