diff --git a/Intersect.Client/Core/Graphics.cs b/Intersect.Client/Core/Graphics.cs
index 4130884fd..529375708 100644
--- a/Intersect.Client/Core/Graphics.cs
+++ b/Intersect.Client/Core/Graphics.cs
@@ -241,7 +241,7 @@ public static void DrawInGame(TimeSpan deltaTime)
             return;
         }
 
-        if (Globals.NeedsMaps || Globals.MapGrid == default)
+        if (Globals.NeedsMaps || Globals.MapGrid == null || RenderingEntities == null)
         {
             return;
         }