diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/powercardstate/SwapState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/powercardstate/SwapState.java
index 293830e6..12cbd965 100644
--- a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/powercardstate/SwapState.java
+++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/powercardstate/SwapState.java
@@ -29,6 +29,8 @@ public SwapState(ClientState parent, ClientGameLogic logic) {
         this.parent = (PowerCardState) parent;
         possibleOwnPieces = new ArrayList<>();
         possibleEnemyPieces = new ArrayList<>();
+        selectedOwnPiece = null;
+        selectedEnemyPiece = null;
     }
 
     @Override
@@ -37,15 +39,15 @@ public void enter() {
         ArrayList<UUID> ownPieces = new ArrayList<>(possibleOwnPieces.stream().map(Piece::getUuid).toList());
         ArrayList<UUID> enemyPieces = new ArrayList<>(possibleEnemyPieces.stream().map(Piece::getUuid).toList());
         logic.addNotification(new SelectableSwapNotification(ownPieces, enemyPieces));
-        possibleOwnPieces = null;
-        possibleEnemyPieces = null;
+        selectedOwnPiece = null;
+        selectedEnemyPiece = null;
     }
 
     @Override
     public void exit() {
         LOGGER.log(System.Logger.Level.INFO, "Exiting SwapState");
-        possibleOwnPieces = null;
-        possibleEnemyPieces = null;
+        possibleOwnPieces.clear();
+        possibleEnemyPieces.clear();
     }
 
     public void setPossibleOwnPieces(ArrayList<Piece> possibleOwnPieces) {