diff --git a/source/RobotAPI/components/ArViz/ArVizStorage.cpp b/source/RobotAPI/components/ArViz/ArVizStorage.cpp
index 261ac386dc405948deba78bebe3a556e2af5574e..01ebcf74ce2617a276864ab4f6eff1ba309c4b4e 100644
--- a/source/RobotAPI/components/ArViz/ArVizStorage.cpp
+++ b/source/RobotAPI/components/ArViz/ArVizStorage.cpp
@@ -22,6 +22,7 @@
 
 #include "ArVizStorage.h"
 
+#include <ArmarXCore/core/logging/Logging.h>
 #include <ArmarXCore/core/util/IceBlobToObject.h>
 #include <ArmarXCore/core/util/ObjectToIceBlob.h>
 #include <ArmarXCore/core/system/ArmarXDataPath.h>
@@ -143,6 +144,12 @@ namespace armarx
             historyEntry.timestampInMicroseconds = nowInMicroSeconds;
             historyEntry.update = update;
 
+            if(update.component.empty())
+            {
+                ARMARX_WARNING << deactivateSpam(10) << "Empty `component` in ArViz update! Discarding update. Check your code ...";
+                continue;
+            }
+
             // Insert or create the layer
             bool found = false;
             for (auto& layer : currentState)