diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tagdetails/AbstractTagToken.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tagdetails/AbstractTagToken.java
index 2df040c65..6d52b78d8 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tagdetails/AbstractTagToken.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tagdetails/AbstractTagToken.java
@@ -250,6 +250,7 @@ public abstract class AbstractTagToken<T extends BaseEntity> implements Serializ
 
     protected void removeTokenItem(final Long tokenId, final String name) {
         tokenField.removeToken(tokenId);
+        tagDetails.remove(tokenId);
         setContainerPropertValues(tokenId, name, tokensAdded.get(tokenId).getColor());
     }