diff --git a/src/core/pyros_django/obs_config/obsconfig_class.py b/src/core/pyros_django/obs_config/obsconfig_class.py
index 5824b6f..f017bfd 100644
--- a/src/core/pyros_django/obs_config/obsconfig_class.py
+++ b/src/core/pyros_django/obs_config/obsconfig_class.py
@@ -1382,7 +1382,10 @@ class OBSConfig:
             protocol_name = self.get_agent_information(self.unit_name, computer_agent_name).get("protocol")
             if protocol_name is None:
                 # Agent has no protocol, might be an general agent of PyROS, return the name of the class (i.e. do nothing)
-                agent_real_name = agent_name
+                if agent_name in computer_agent_name:
+                    agent_real_name = agent_name
+                else:
+                    continue
             else:
                 agent_real_name, _ =  os.path.splitext(protocol_name)
             if agent_real_name == agent_name:
--
libgit2 0.21.2