diff --git a/libraries/entities/src/EntityEditPacketSender.cpp b/libraries/entities/src/EntityEditPacketSender.cpp
index 2ef7f1821b..5d7bd61854 100644
--- a/libraries/entities/src/EntityEditPacketSender.cpp
+++ b/libraries/entities/src/EntityEditPacketSender.cpp
@@ -91,7 +91,7 @@ void EntityEditPacketSender::queueEditEntityMessage(PacketType type,
         return;
     }
 
-    if (entityTree->isServerlessMode()) {
+    if (entityTree && entityTree->isServerlessMode()) {
         // if we are in a serverless domain, don't send edit packets
         return;
     }