diff --git a/app/src/views/GamePage.vue b/app/src/views/GamePage.vue
index fdd4c3b..848614c 100644
--- a/app/src/views/GamePage.vue
+++ b/app/src/views/GamePage.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { onMounted } from 'vue'
+import { onMounted, ref } from 'vue'
 import socket from '../utils/socket'
 import sessionManager from '../utils/session'
 import CommandlistPart from '../components/CommandlistPart.vue'
@@ -10,6 +10,8 @@ import VisualizationPart from '../components/VisualizationPart.vue'
 import ControlPalette from '../components/ControlPalette.vue'
 import CompleteModal from '../components/CompleteModal.vue'
 
+const completed = ref(false)
+
 onMounted(async () => {
   await sessionManager.lastOrCreate()
   socket.connect(sessionManager.getSession())
@@ -29,6 +31,14 @@ onMounted(async () => {
     sessionManager.setTasks(tasks)
   })
   socket.on('message', console.log)
+  socket.on('status', (event) => {
+    console.log('status', event)
+    if (event === 'finished') {
+      setTimeout(() => {
+        completed.value = true
+      }, 5000)
+    }
+  })
 })
 </script>
 
@@ -65,7 +75,7 @@ onMounted(async () => {
       </div>
       <ControlPalette />
     </div>
-    <CompleteModal />
+    <CompleteModal v-if="completed" />
   </div>
 </template>
 <script></script>
diff --git a/server/src/game/sessionHandler.js b/server/src/game/sessionHandler.js
index 124c305..a6a91f8 100644
--- a/server/src/game/sessionHandler.js
+++ b/server/src/game/sessionHandler.js
@@ -50,6 +50,7 @@ export default class SessionHandler {
     if (stage.id === 'END') {
       this.session.status = 'finished'
       this.session.finishedAt = new Date()
+      pushToSession(this.session.id, 'status', 'finished')
     }
 
     this.addNewTasks()