diff --git a/src/main/java/inf112/fiasko/roborally/objects/RoboRallyGame.java b/src/main/java/inf112/fiasko/roborally/objects/RoboRallyGame.java
index 587ba62..7eb2ea5 100644
--- a/src/main/java/inf112/fiasko/roborally/objects/RoboRallyGame.java
+++ b/src/main/java/inf112/fiasko/roborally/objects/RoboRallyGame.java
@@ -329,7 +329,7 @@ public class RoboRallyGame implements DrawableGame, InteractableGame {
             }
 
             //The player has no locked cards. All previously locked cards should go into the free deck
-            if (robotDamage <= 4) {
+            if (robotDamage <= 4 || playerProgram.size() == 0) {
                 lockedPlayerDeck.emptyInto(player.getProgrammingCardDeck());
                 continue;
             }