diff --git a/src/App.vue b/src/App.vue
index 151cfbe..8dbf1a6 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -466,7 +466,7 @@ export default {
       return !this.gameId || this.isHost
     },
     isGuessSuspended() {
-      return this.step === 'game' && this.getCurrentTileStatus() === 'paused'
+      return this.step === 'game' && this.getCurrentTileStatus() === 'paused' && !!this.guessingTeamId
     },
     viewerSuspended() {
       return this.isGuessSuspended && !this.canControlGame
@@ -1061,7 +1061,7 @@ export default {
 
       if (status === 'playing') {
         this.tiles[key].status = 'paused'
-        this.guessingTeamId = this.currentSelectorId
+        this.guessingTeamId = null
         this.pauseTransitionLockUntil = 0
         const player = this.getPlayer()
         player?.pause()
@@ -1073,6 +1073,7 @@ export default {
         if (this.guessingTeamId) return
         if (Date.now() < this.pauseTransitionLockUntil) return
         this.tiles[key].status = 'guessed'
+        this.guessingTeamId = null
         this.pauseTransitionLockUntil = 0
         this.lastAwardedTeamId = null
         if (clue.answer) {
@@ -1112,6 +1113,7 @@ export default {
       const [cIndex, qIndex] = this.currentTileKey.split('-').map(Number)
       const clue = this.selectedGame.categories[cIndex].clues[qIndex]
       this.tiles[this.currentTileKey].status = 'guessed'
+      this.guessingTeamId = null
       this.pauseTransitionLockUntil = 0
       this.lastAwardedTeamId = null
       if (clue.answer) {