diff --git a/api/src/main/java/de/erethon/dungeonsxl/api/sign/Button.java b/api/src/main/java/de/erethon/dungeonsxl/api/sign/Button.java
index 87937d64..d3c67825 100644
--- a/api/src/main/java/de/erethon/dungeonsxl/api/sign/Button.java
+++ b/api/src/main/java/de/erethon/dungeonsxl/api/sign/Button.java
@@ -70,7 +70,11 @@ public abstract class Button extends AbstractDSign {
      */
     @Override
     public void trigger(Player player) {
-        push(player);
+        if (player != null) {
+            push(player);
+        } else {
+            push();
+        }
     }
 
 }