diff --git a/frontend/src/socket.ts b/frontend/src/socket.ts
index 480c48f2f..de678f41a 100644
--- a/frontend/src/socket.ts
+++ b/frontend/src/socket.ts
@@ -27,7 +27,7 @@ alarmSocket.on('disconnect from alarm socket', (): void => {
   alarmSocketState.connected = false
 })
 
-monitoringSocket.on('connect', (): void => {
+monitoringSocket.on('connect', async (): Promise<void> => {
   console.log('connected to monitoring socket')
   monitoringSocketState.connected = true
   await subscribeToAllTopics()
diff --git a/frontend/src/topics.ts b/frontend/src/topics.ts
index a8b95f7d7..70793175e 100644
--- a/frontend/src/topics.ts
+++ b/frontend/src/topics.ts
@@ -1,33 +1,34 @@
 import { useTopicsStore } from '@/stores/topics'
 import RequestHelper, { monitoringHost, monitoringPort } from '@/utils/RequestHelper'
 import { type AxiosResponse, HttpStatusCode as AxiosHttpStatusCode } from 'axios'
-import { socket } from '@/socket'
+import { monitoringSocket } from '@/socket'
 import router from '@/router'
 
 export const subscribeToAllTopics = async (): Promise<void> => {
   console.log('subscribe to all topics')
 
   const res: AxiosResponse = await RequestHelper.get(`http://${monitoringHost}:${monitoringPort}/devices`)
+  console.log(res)
   if (res.status == AxiosHttpStatusCode.Ok) {
     for (let i = 0; i < res.data.length; i++) {
       useTopicsStore().addTopic(res.data[i]._id.type + '_' + res.data[i]._id.code)
     }
-
-    socket.on('subscribed', (): void => {
+    console.log("ARR", useTopicsStore().subscribedTopics)
+    monitoringSocket.on('subscribed', (): void => {
       console.log('subscribed')
       if (router.currentRoute.value.name === 'Home') {
-        socket.emit(
+        monitoringSocket.emit(
           'resume',
           useTopicsStore().subscribedTopics.filter((topic: string): boolean => topic.startsWith('SENSOR'))
         )
       } else if (router.currentRoute.value.name === 'Monitoring') {
-        socket.emit(
+        monitoringSocket.emit(
           'resume',
           useTopicsStore().subscribedTopics.filter((topic: string): boolean => topic.startsWith('CAMERA'))
         )
       }
     })
-    socket.emit('subscribe', useTopicsStore().subscribedTopics)
+    monitoringSocket.emit('subscribe', useTopicsStore().subscribedTopics)
   } else {
     console.log('Error while fetching devices')
   }
diff --git a/monitoring/src/index.ts b/monitoring/src/index.ts
index 3a86b58f6..878a1e334 100644
--- a/monitoring/src/index.ts
+++ b/monitoring/src/index.ts
@@ -63,14 +63,14 @@ const mongoConnect = async (): Promise<void> => {
     })
 }
 
-if (process.env.NODE_ENV !== 'test') {
+if (process.env.NODE_ENV === 'test') {
   server.listen(PORT, async (): Promise<void> => {
-    console.log(`Monitoring server listening on ${process.env.MONITORING_PORT}`)
     await mongoConnect()
-    //await setupConsumers()
+    // await setupConsumers()
   })
 } else {
   server.listen(PORT, async (): Promise<void> => {
+    console.log(`Monitoring server listening on ${process.env.MONITORING_PORT}`)
     await mongoConnect()
     await setupConsumers()
   })