diff --git a/src/main/java/net/rptools/maptool/server/MapToolServer.java b/src/main/java/net/rptools/maptool/server/MapToolServer.java
index 2ab1bd2e39..e80c695aa3 100644
--- a/src/main/java/net/rptools/maptool/server/MapToolServer.java
+++ b/src/main/java/net/rptools/maptool/server/MapToolServer.java
@@ -76,7 +76,7 @@ public MapToolServer(ServerConfig config, ServerPolicy policy, PlayerDatabase pl
     assetProducerThread.start();
 
     // Start a heartbeat if requested
-    if (!config.isPersonalServer()) {
+    if (config.isServerRegistered() && !config.isPersonalServer()) {
       heartbeatThread = new HeartbeatThread();
       heartbeatThread.start();
     }