diff --git a/source/RobotAPI/components/ArViz/ArVizStorage.cpp b/source/RobotAPI/components/ArViz/ArVizStorage.cpp
index 261ac386dc405948deba78bebe3a556e2af5574e..decbf95c39a16482ee3bc6975396812397c3d37e 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>
@@ -138,6 +139,15 @@ namespace armarx
 
         for (auto& update : updates)
         {
+            if (update.component.empty())
+            {
+                ARMARX_INFO << deactivateSpam(120)
+                            << "Discarding ArViz update with empty component name. Check whether "
+                            << "you correctly create your ArViz client (`armarx::viz::Client`) "
+                            << "in your code.";
+                continue;
+            }
+
             auto& historyEntry = history.emplace_back();
             historyEntry.revision = revision;
             historyEntry.timestampInMicroseconds = nowInMicroSeconds;