diff --git a/LICENSE.md b/LICENSE.md
index d3868bd50e..d26a9927eb 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -54,4 +54,5 @@ vytskalt <vytskalt@protonmail.com>
 TheFruxz <cedricspitzer@outlook.de>
 Kieran Wallbanks <kieran.wallbanks@gmail.com>
 Denery <dorofeevij@gmail.com>
+Jakubk15 <jakubk15@protonmail.com>
 ```
diff --git a/patches/server/Paper-Plugins.patch b/patches/server/Paper-Plugins.patch
index e1033495ec..3913a769fb 100644
--- a/patches/server/Paper-Plugins.patch
+++ b/patches/server/Paper-Plugins.patch
@@ -229,11 +229,19 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +            //.append(INFO_ICON_START.hoverEvent(SERVER_PLUGIN_INFO)); TODO: Add docs
 +
 +        sender.sendMessage(infoMessage);
-+        sender.sendMessage(PAPER_HEADER);
++
++        if (!paperPlugins.isEmpty()) {
++            sender.sendMessage(PAPER_HEADER);
++        }
++
 +        for (Component component : formatProviders(paperPlugins)) {
 +            sender.sendMessage(component);
 +        }
-+        sender.sendMessage(BUKKIT_HEADER);
++
++        if (!spigotPlugins.isEmpty()) {
++            sender.sendMessage(BUKKIT_HEADER);
++        }
++        
 +        for (Component component : formatProviders(spigotPlugins)) {
 +            sender.sendMessage(component);
 +        }