diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/entities/EntityRendererManager.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/entities/EntityRendererManager.kt
index 070b46869..4ac1b5138 100644
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/entities/EntityRendererManager.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/entities/EntityRendererManager.kt
@@ -38,11 +38,13 @@ class EntityRendererManager(val renderer: EntitiesRenderer) : Iterable<EntityRen
 
     fun init() {
         renderer.connection.world.entities::entities.observeSet(this) {
-            for (entity in it.adds) {
-                this += entity
-            }
-            for (entity in it.removes) {
-                this -= entity
+            renderer.queue.add {
+                for (entity in it.adds) {
+                    this += entity
+                }
+                for (entity in it.removes) {
+                    this -= entity
+                }
             }
         }
     }