diff --git a/tetris.py b/tetris.py
index c3db3bb..6ffe931 100644
--- a/tetris.py
+++ b/tetris.py
@@ -780,7 +780,6 @@ class Game:
                 ):
                     self.place_piece(cp.x, cp.y + dy, self.current_block)
                     self.current_block = None
-                    self.did_swap = False
                     return
             self.game_over = True
 
@@ -1141,6 +1140,7 @@ class Game:
         )
 
     def swap_in_next_piece(self, force: bool = False):
+        self.did_swap = False
         if not self.next_piece or force:
             self.next_piece = self.random_tetromino()
             self.current_block = self.random_tetromino()