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 9b9754aa..b77d5cef 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
@@ -18,6 +18,7 @@ public class SwapState extends PowerCardStates {
     private final System.Logger LOGGER = System.getLogger(this.getClass().getName());
 
     private final PowerCardState parent;
+    private boolean hasSended = false;
 
     private ArrayList<Piece> possibleOwnPieces;
     private ArrayList<Piece> possibleEnemyPieces;
@@ -33,6 +34,7 @@ public SwapState(ClientState parent, ClientGameLogic logic) {
 
     @Override
     public void enter() {
+        hasSended = false;
         LOGGER.log(System.Logger.Level.INFO, "Entering SwapState");
         ArrayList<UUID> ownPieces = new ArrayList<>(possibleOwnPieces.stream().map(Piece::getUuid).toList());
         ArrayList<UUID> enemyPieces = new ArrayList<>(possibleEnemyPieces.stream().map(Piece::getUuid).toList());
@@ -41,6 +43,7 @@ public void enter() {
 
     @Override
     public void exit() {
+        hasSended = false;
         LOGGER.log(System.Logger.Level.INFO, "Exiting SwapState");
         possibleOwnPieces = null;
         possibleEnemyPieces = null;
@@ -66,7 +69,10 @@ public void selectPiece(Piece piece){
             temp.add(selectedOwnPiece);
             temp.add(selectedEnemyPiece);
             System.out.println("Client : Swap: temp: "+temp.get(0)+temp.get(1));
-            logic.send(new SelectedPiecesMessage(temp));
+            if(!hasSended){
+                hasSended = true;
+                logic.send(new SelectedPiecesMessage(temp));
+            }
         }
     }