diff --git a/source/RobotAPI/components/ArViz/ArVizStorage.cpp b/source/RobotAPI/components/ArViz/ArVizStorage.cpp
index c2f698f21d0e493acc543582c0f8e2c1312ea3b7..decbf95c39a16482ee3bc6975396812397c3d37e 100644
--- a/source/RobotAPI/components/ArViz/ArVizStorage.cpp
+++ b/source/RobotAPI/components/ArViz/ArVizStorage.cpp
@@ -139,11 +139,6 @@ namespace armarx
 
         for (auto& update : updates)
         {
-            auto& historyEntry = history.emplace_back();
-            historyEntry.revision = revision;
-            historyEntry.timestampInMicroseconds = nowInMicroSeconds;
-            historyEntry.update = update;
-
             if (update.component.empty())
             {
                 ARMARX_INFO << deactivateSpam(120)
@@ -153,6 +148,11 @@ namespace armarx
                 continue;
             }
 
+            auto& historyEntry = history.emplace_back();
+            historyEntry.revision = revision;
+            historyEntry.timestampInMicroseconds = nowInMicroSeconds;
+            historyEntry.update = update;
+
             // Insert or create the layer
             bool found = false;
             for (auto& layer : currentState)