diff --git a/src/client/classes/Scraper.py b/src/client/classes/Scraper.py
index 2ea4733..4e16d5a 100644
--- a/src/client/classes/Scraper.py
+++ b/src/client/classes/Scraper.py
@@ -154,6 +154,8 @@ class Scraper:
         # If you are indeed the creator, create the game and disclose its name to the server
         if checker["creator"] == name:
             created = game.create() 
+            # TODO: This doesn't work, because we need to serve stuff separately(as in private keys)
+            # Fix
             requests.put(f"{self.URL}/current/1", data={
                 "lobby_name": created,
                 "players": 1,
diff --git a/src/server/server_client_api/views.py b/src/server/server_client_api/views.py
index 06792a8..20b06e0 100644
--- a/src/server/server_client_api/views.py
+++ b/src/server/server_client_api/views.py
@@ -43,9 +43,14 @@ def current(request):
     Creates/edits/deletes the current game that's being played and orchestrates
     the matchmaking process.
     """
-    # Change
+    # We need to get the singular game that we want based on the creator
+    # We can't use the default get_object_or_404 because we need to get the
+    # object based on the creator, not the pk
+
+    
     current = Current.objects.all()
     if request.method == "GET":
+        
         serializer = CurrentSerializer(current, many=True)
         return Response(serializer.data)
 
@@ -59,6 +64,7 @@ def current(request):
         return Response("Invalid data.", status=status.HTTP_400_BAD_REQUEST)
     
     if request.method == "PUT":
+        current = Current.objects.filter(creator=request.data.get("creator", None)).first()
         if not current:
             return Response("Current game doesn't exist.", status=status.HTTP_404_NOT_FOUND)
         serializer = CurrentSerializer(current, data=request.data)