diff --git a/src/main/java/inf112/fiasko/roborally/objects/Board.java b/src/main/java/inf112/fiasko/roborally/objects/Board.java
index 775af3a..5cc7369 100644
--- a/src/main/java/inf112/fiasko/roborally/objects/Board.java
+++ b/src/main/java/inf112/fiasko/roborally/objects/Board.java
@@ -304,10 +304,9 @@ public class Board {
                 robot.setFacingDirection(Direction.NORTH);
                 robots.put(robot.getRobotId(), robot);
             }
-            else {
-                deadRobots.remove(robot);
-            }
+            else {deadRobots.remove(robot); }
         }
+        deadRobots = new ArrayList<>();
     }
 
     /**
diff --git a/src/test/java/inf112/fiasko/roborally/objects/BoardTest.java b/src/test/java/inf112/fiasko/roborally/objects/BoardTest.java
index f135563..8feceda 100644
--- a/src/test/java/inf112/fiasko/roborally/objects/BoardTest.java
+++ b/src/test/java/inf112/fiasko/roborally/objects/BoardTest.java
@@ -132,7 +132,8 @@ public class BoardTest {
 
     @Test
     public void respawnRobotAtBackupPosition() {
-        Robot robot = board.getAliveRobots().get(0);
+        Robot robot = robotList.get(0);
+        robot.setPosition(new Position(0, 0));
         board.moveRobot(robot.getRobotId(), Direction.NORTH);
         board.removeDeadRobotFromBoard(robot);
         board.respawnRobots();