diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/impl/misc/InfoCommand.java b/common/src/main/java/me/lucko/luckperms/common/commands/impl/misc/InfoCommand.java
index 98ff1c2eb..11d6135f1 100644
--- a/common/src/main/java/me/lucko/luckperms/common/commands/impl/misc/InfoCommand.java
+++ b/common/src/main/java/me/lucko/luckperms/common/commands/impl/misc/InfoCommand.java
@@ -40,7 +40,6 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
 import me.lucko.luckperms.common.utils.DateUtil;
 import me.lucko.luckperms.common.utils.Predicates;
 
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -83,14 +82,12 @@ public class InfoCommand extends SingleCommand {
                 plugin.getCalculatorFactory().getActiveProcessors().stream().collect(Collectors.joining(", "))
         );
 
-        LinkedHashMap<String, Object> platformInfo = plugin.getExtraInfo();
-        if (platformInfo == null || platformInfo.isEmpty()) {
-            return CommandResult.SUCCESS;
-        }
-
-        Message.EMPTY.send(sender, "&f-  &bPlatform Info:");
-        for (Map.Entry<String, Object> e : platformInfo.entrySet()) {
-            Message.EMPTY.send(sender, "&f-     &3" + e.getKey() + ": " + formatValue(e.getValue().toString()));
+        Map<String, Object> platformInfo = plugin.getExtraInfo();
+        if (!platformInfo.isEmpty()) {
+            Message.EMPTY.send(sender, "&f-  &bPlatform Info:");
+            for (Map.Entry<String, Object> e : platformInfo.entrySet()) {
+                Message.EMPTY.send(sender, "&f-     &3" + e.getKey() + ": " + formatValue(e.getValue().toString()));
+            }
         }
 
         return CommandResult.SUCCESS;
diff --git a/common/src/main/java/me/lucko/luckperms/common/plugin/LuckPermsPlugin.java b/common/src/main/java/me/lucko/luckperms/common/plugin/LuckPermsPlugin.java
index 32d9c1552..c2a545bf2 100644
--- a/common/src/main/java/me/lucko/luckperms/common/plugin/LuckPermsPlugin.java
+++ b/common/src/main/java/me/lucko/luckperms/common/plugin/LuckPermsPlugin.java
@@ -376,10 +376,10 @@ public interface LuckPermsPlugin {
     /**
      * Gets a map of extra information to be shown in the info command
      *
-     * @return a map of options, or null
+     * @return a map of options
      */
     default Map<String, Object> getExtraInfo() {
-        return null;
+        return Collections.emptyMap();
     }
 
     /**