diff --git a/Plan/sponge/src/main/java/com/djrapitops/plan/commands/use/SpongeCommand.java b/Plan/sponge/src/main/java/com/djrapitops/plan/commands/use/SpongeCommand.java
index d0010649a..01b169be0 100644
--- a/Plan/sponge/src/main/java/com/djrapitops/plan/commands/use/SpongeCommand.java
+++ b/Plan/sponge/src/main/java/com/djrapitops/plan/commands/use/SpongeCommand.java
@@ -103,7 +103,7 @@ public class SpongeCommand implements CommandCallable {
 
     @Override
     public Optional<Text> getShortDescription(CommandSource source) {
-        return Optional.of(Text.of(command.getDescription()));
+        return Optional.ofNullable(command.getDescription()).map(Text::of);
     }
 
     @Override