diff --git a/src/main/java/emu/grasscutter/game/entity/gadget/GadgetWorktop.java b/src/main/java/emu/grasscutter/game/entity/gadget/GadgetWorktop.java
index 7b7c11854..db1b70c19 100644
--- a/src/main/java/emu/grasscutter/game/entity/gadget/GadgetWorktop.java
+++ b/src/main/java/emu/grasscutter/game/entity/gadget/GadgetWorktop.java
@@ -69,9 +69,7 @@ public final class GadgetWorktop extends GadgetContent {
     }
 
     public boolean onSelectWorktopOption(SelectWorktopOptionReq req) {
-        if (this.handler != null) {
-            this.handler.onSelectWorktopOption(this, req.getOptionId());
-        }
-        return false;
+        return this.handler != null && this.handler
+            .onSelectWorktopOption(this, req.getOptionId());
     }
 }