diff --git a/RGB.NET.Core/Ids/IdGenerator.cs b/RGB.NET.Core/Ids/IdGenerator.cs
index 41c2070..99beaa6 100644
--- a/RGB.NET.Core/Ids/IdGenerator.cs
+++ b/RGB.NET.Core/Ids/IdGenerator.cs
@@ -43,7 +43,7 @@ public static class IdGenerator
         {
             mappedId = id;
             int mappingCounter = 1;
-            while (_registeredIds.Contains(id))
+            while (_registeredIds.Contains(mappedId))
                 mappedId = $"{id} ({++mappingCounter})";
 
             _registeredIds.Add(mappedId);