diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java b/paper-server/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
new file mode 100644
index 0000000000..d15bb78273
--- /dev/null
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
@@ -0,0 +1,17 @@
+
+package org.bukkit.craftbukkit.util;
+
+import net.minecraft.server.MinecraftServer;
+
+public class ServerShutdownThread extends Thread {
+    private final MinecraftServer server;
+
+    public ServerShutdownThread(MinecraftServer server) {
+        this.server = server;
+    }
+
+    @Override
+    public void run() {
+        server.g();
+    }
+}