diff --git a/subsystems/DiscordRPC/src/main/java/org/terasology/subsystem/discordrpc/DiscordRPCSubSystem.java b/subsystems/DiscordRPC/src/main/java/org/terasology/subsystem/discordrpc/DiscordRPCSubSystem.java
index a8a4914bfd..0e4331471d 100644
--- a/subsystems/DiscordRPC/src/main/java/org/terasology/subsystem/discordrpc/DiscordRPCSubSystem.java
+++ b/subsystems/DiscordRPC/src/main/java/org/terasology/subsystem/discordrpc/DiscordRPCSubSystem.java
@@ -132,8 +132,10 @@ public synchronized void postInitialise(Context context) {
 
     @Override
     public synchronized void preShutdown() {
-        thread.disable();
-        thread.stop();
+        if (thread != null) {
+            thread.disable();
+            thread.stop();
+        }
     }
 
     @Override