diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/AbstractMetadataPopupLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/AbstractMetadataPopupLayout.java
index 0dcbb88ff..1fd4b3ff5 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/AbstractMetadataPopupLayout.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/AbstractMetadataPopupLayout.java
@@ -502,6 +502,7 @@ public abstract class AbstractMetadataPopupLayout<E extends NamedVersionedEntity
 
     private void setUpDetails(final Long swId, final String metaDatakey) {
         resetDetails();
+        metadataWindow.clearOriginalValues();
         if (swId != null) {
             metaDataGrid.getContainerDataSource().removeAllItems();
             populateGrid();