diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 429320bfba..b0a2e697cc 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -930,6 +930,10 @@ public final class CraftServer implements Server {
         return configuration.getInt("settings.spawn-radius", -1);
     }
 
+    public String getShutdownMessage() {
+        return configuration.getString("settings.shutdown-message");
+    }
+
     public int getSpawnRadius() {
         return ((DedicatedServer) console).propertyManager.getInt("spawn-protection", 16);
     }
diff --git a/paper-server/src/main/resources/configurations/bukkit.yml b/paper-server/src/main/resources/configurations/bukkit.yml
index 5307abe449..e4d6d96fe6 100644
--- a/paper-server/src/main/resources/configurations/bukkit.yml
+++ b/paper-server/src/main/resources/configurations/bukkit.yml
@@ -2,10 +2,10 @@
 # As you can see, there's actually not that much to configure without any plugins.
 # For a reference for any variable inside this file, check out the bukkit wiki at
 # http://wiki.bukkit.org/Bukkit.yml
-# 
+#
 # If you need help on this file, feel free to join us on irc or leave a message
 # on the forums asking for advice.
-# 
+#
 # IRC: #bukkit @ esper.net
 #    (If this means nothing to you, just go to http://webchat.esper.net/?channels=bukkit )
 # Forums: http://forums.bukkit.org/forums/bukkit-help.6/
@@ -24,6 +24,7 @@ settings:
     connection-throttle: 4000
     query-plugins: true
     deprecated-verbose: default
+    shutdown-message: Server closed
 spawn-limits:
     monsters: 70
     animals: 15