diff --git a/main/src/main/java/net/citizensnpcs/trait/HologramTrait.java b/main/src/main/java/net/citizensnpcs/trait/HologramTrait.java
index 4bef485f6..cb3c083da 100644
--- a/main/src/main/java/net/citizensnpcs/trait/HologramTrait.java
+++ b/main/src/main/java/net/citizensnpcs/trait/HologramTrait.java
@@ -750,6 +750,7 @@ public class HologramTrait extends Trait {
     public abstract static class SingleEntityHologramRenderer implements HologramRenderer {
         protected NPC hologram;
         private NPCRegistry registry;
+        private int spawnWaitTicks;
         protected String text;
         protected int viewRange = -1;
 
@@ -780,10 +781,13 @@ public class HologramTrait extends Trait {
 
         @Override
         public void render(NPC npc, Vector3d offset) {
-            if (getEntities().isEmpty()) {
+            if (getEntities().isEmpty() && spawnWaitTicks-- <= 0) {
                 destroy();
                 spawnHologram(npc, offset);
+                spawnWaitTicks = 5;
             }
+            if (!hologram.isSpawned())
+                return;
             render0(npc, offset);
         }
 
diff --git a/main/src/main/java/net/citizensnpcs/trait/HomeTrait.java b/main/src/main/java/net/citizensnpcs/trait/HomeTrait.java
index 947d39b77..1bba17c2b 100644
--- a/main/src/main/java/net/citizensnpcs/trait/HomeTrait.java
+++ b/main/src/main/java/net/citizensnpcs/trait/HomeTrait.java
@@ -41,8 +41,8 @@ public class HomeTrait extends Trait {
 
     @Override
     public void run() {
-        if (!npc.isSpawned() || location == null || npc.getStoredLocation().distance(location) < 0.1
-                || npc.getNavigator().isNavigating()) {
+        if (!npc.isSpawned() || location == null || npc.getNavigator().isNavigating()
+                || npc.getStoredLocation().distance(location) < 0.1) {
             t = 0;
             return;
         }