diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/board/BoardHandler.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/board/BoardHandler.java
index 499874d0..a0ae295d 100644
--- a/Projekte/mdga/client/src/main/java/pp/mdga/client/board/BoardHandler.java
+++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/board/BoardHandler.java
@@ -718,14 +718,14 @@ public void clearSelectable() {
             p.unHighlight();
             p.setSelectable(false);
             p.setHoverable(false);
-            if (selectedPieceNodeMap.get(p) != null) selectedPieceNodeMap.get(p).unSelect();
-            if (selectedPieceNodeMap.get(p) != null) selectedPieceNodeMap.get(p).unHighlight();
         }
         for (PieceControl p : selectableOwnPieces) {
             p.unSelect();
             p.unHighlight();
             p.setSelectable(false);
             p.setHoverable(false);
+            if (selectedPieceNodeMap.get(p) != null) selectedPieceNodeMap.get(p).unSelect();
+            if (selectedPieceNodeMap.get(p) != null) selectedPieceNodeMap.get(p).unHighlight();
         }
         for (NodeControl n : outlineNodes) {
             n.deOutline();