diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts
index a25a4a63037a30611f55669652a3787536d32815..2eb0fd37c0c853f6107e329ce6fe6d6e1fa7dc04 100644
--- a/frontend/src/app/app.module.ts
+++ b/frontend/src/app/app.module.ts
@@ -22,7 +22,7 @@ import { RemoveCategoryComponent } from './question-shit/remove-category/remove-
 import { SocketIoConfig, SocketIoModule } from 'ngx-socket-io';
 import { GameroomComponent } from './gameroom/gameroom.component';
 
-const config: SocketIoConfig = { url: 'http://0.0.0.0:30992', options: { } };
+const config: SocketIoConfig = { url: 'http://0.0.0.0:30992', options: { autoConnect: false } };
 
 @NgModule({
   declarations: [
diff --git a/frontend/src/app/gameroom/gameroom.component.ts b/frontend/src/app/gameroom/gameroom.component.ts
index b4eab415587af7307933a596617d4d75e3b949d3..4d938c3fff6e369936a401a8acee4f376cf2ead6 100644
--- a/frontend/src/app/gameroom/gameroom.component.ts
+++ b/frontend/src/app/gameroom/gameroom.component.ts
@@ -7,7 +7,7 @@ import { Answer } from '../Types/types';
   templateUrl: './gameroom.component.html',
   styleUrls: ['./gameroom.component.css']
 })
-export class GameroomComponent implements OnInit {
+export class GameroomComponent implements OnInit, OnDestroy {
 
   playerNumber!: number;
   gameStart: boolean = false;
@@ -22,6 +22,9 @@ export class GameroomComponent implements OnInit {
     private socket: SocketService) {}
 
   ngOnInit(): void {
+
+    this.socket.connectSocket();
+
     this.gameStart = false;
     this.inRoom = false;
     this.endGame = false;
@@ -53,6 +56,10 @@ export class GameroomComponent implements OnInit {
     })
   }
 
+  ngOnDestroy(): void {
+    this.socket.disconnectSocket();
+  }
+
   joinRoom(): void {
     this.socket.joinRoom();
     this.inRoom = true;
diff --git a/frontend/src/app/services/socket.service.ts b/frontend/src/app/services/socket.service.ts
index 828d6472779448f2319cb5140467142f9a92179f..a2ae17aa13d9dd3f4571277d90c88afbd5208794 100644
--- a/frontend/src/app/services/socket.service.ts
+++ b/frontend/src/app/services/socket.service.ts
@@ -29,6 +29,11 @@ export class SocketService {
     this.recieveQuestion();
   }
 
+  connectSocket() {
+    this.refreshSocketToken();
+    this.socket.connect();
+  }
+
   get playerNumber() {
     return this._playerNumber.asObservable();
   }