diff --git a/src/main/java/ch/psi/mxsc/Controller.java b/src/main/java/ch/psi/mxsc/Controller.java
index f2e1513..5eeca5c 100644
--- a/src/main/java/ch/psi/mxsc/Controller.java
+++ b/src/main/java/ch/psi/mxsc/Controller.java
@@ -411,8 +411,8 @@ public class Controller {
     
     public List<Puck> getFreePucks() {
         List<Puck> ret = new ArrayList<>();
-        for (Puck p : basePlate.getPucks()) {                
-            if (p.getDetection() == Detection.Empty ) {
+        for (Puck p : basePlate.getPucks()) {                            
+            if (!p.isDisabled() && (p.getDetection() == Detection.Empty )) {
                 ret.add(p);
             }
         }
diff --git a/src/main/java/ch/psi/mxsc/Puck.java b/src/main/java/ch/psi/mxsc/Puck.java
index 1c6b5b4..59c989f 100644
--- a/src/main/java/ch/psi/mxsc/Puck.java
+++ b/src/main/java/ch/psi/mxsc/Puck.java
@@ -382,6 +382,7 @@ public class Puck extends DeviceBase {
          return (getSegment() - new Character('A')) * BasePlate.numberOfPucksPerSegments + getNumber() - 1;
     }
 
+    /*
     boolean enabled;
 
     public boolean isEnabled() {
@@ -391,6 +392,7 @@ public class Puck extends DeviceBase {
     public void setEnabled(boolean value) {
         enabled = value;
     }
+*/
 
     public enum Detection {
         Empty,