diff --git a/client/src/sockets.ts b/client/src/sockets.ts
index e4e9b9230db2674e6e374ea9da70af136527fdce..874bfc46ad3a003013d32c31585704aceb527f84 100644
--- a/client/src/sockets.ts
+++ b/client/src/sockets.ts
@@ -28,8 +28,6 @@ export const socket_connect = () => {
 
     socket.on('set_timer', (data: SetTimerInterface) => {
       setPresentationTimer(data.timer)(store.dispatch)
-      // store.dispatch(setTimerEnabled(data.timer.enabled))
-      // store.dispatch(setTimer(data.timer.value))
     })
 
     socket.on('end_presentation', () => {
diff --git a/server/app/core/sockets.py b/server/app/core/sockets.py
index 9c6137cae8a72aaf5006bbe677060a14d5c7688c..f4909531961078663f4e9d014311fec126afd560 100644
--- a/server/app/core/sockets.py
+++ b/server/app/core/sockets.py
@@ -1,6 +1,6 @@
 import app.database.controller as dbc
 from app.core import db
-from app.database.models import Competition, Slide, ViewType
+from app.database.models import Competition, Slide, Team, ViewType
 from flask.globals import request
 from flask_socketio import SocketIO, emit, join_room
 
@@ -83,10 +83,11 @@ def join_presentation(data):
         print("CODE DOES NOT EXIST")
         return
 
-    if item_code.view_type_id == team_view_id:
-        pass  # TODO: Get competition_id from team instead
-    else:
-        competition_id = item_code.pointer
+    competition_id = (
+        item_code.pointer
+        if item_code.view_type_id != team_view_id
+        else db.session.query(Team).filter(Team.id == item_code.pointer).one().competition_id
+    )
 
     if competition_id not in presentations:
         print("THAT COMPETITION IS CURRENTLY NOT ACTIVE")