diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/SelectPieceState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/SelectPieceState.java
index 884c546d..23c87668 100644
--- a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/SelectPieceState.java
+++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/SelectPieceState.java
@@ -37,8 +37,10 @@ public void setPossiblePieces(ArrayList<Piece> possiblePieces) {
 
     @Override
     public void selectPiece(Piece piece) {
-        if (possiblePieces.contains(piece)) {
-            logic.send(new SelectedPiecesMessage(piece.getUuid()));
+        ArrayList<Piece> pieces = new ArrayList<>();
+        if(possiblePieces.contains(piece)){
+            pieces.add(piece);
+            logic.send(new SelectedPiecesMessage(pieces));
         }
     }
 
diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/StartPieceState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/StartPieceState.java
index 2f8b1d14..4c9801d2 100644
--- a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/StartPieceState.java
+++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/StartPieceState.java
@@ -7,6 +7,8 @@
 import pp.mdga.message.client.SelectedPiecesMessage;
 import pp.mdga.message.server.MoveMessage;
 
+import java.util.ArrayList;
+
 public class StartPieceState extends ChoosePieceStates {
 
     private final ChoosePieceState parent;
@@ -30,8 +32,10 @@ public void exit() {
 
     @Override
     public void selectPiece(Piece piece){
+        ArrayList<Piece> pieces = new ArrayList<>();
         if(moveablePiece.equals(piece)){
-            logic.send(new SelectedPiecesMessage(piece.getUuid()));
+            pieces.add(piece);
+            logic.send(new SelectedPiecesMessage(pieces));
         }
     }
 
diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/WaitingPieceState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/WaitingPieceState.java
index 6bcbc8a5..8aff30a8 100644
--- a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/WaitingPieceState.java
+++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/WaitingPieceState.java
@@ -8,6 +8,9 @@
 import pp.mdga.message.client.SelectedPiecesMessage;
 import pp.mdga.message.server.MoveMessage;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class WaitingPieceState extends ChoosePieceStates {
 
     private final ChoosePieceState parent;
@@ -29,8 +32,10 @@ public void exit() {
 
     @Override
     public void selectPiece(Piece piece){
+        ArrayList<Piece> pieces = new ArrayList<>();
         if(moveablePiece.equals(piece)){
-            logic.send(new SelectedPiecesMessage(piece.getUuid()));
+            pieces.add(piece);
+            logic.send(new SelectedPiecesMessage(pieces));
         }
     }