diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/layouts/AbstractCreateUpdateTagLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/layouts/AbstractCreateUpdateTagLayout.java
index 4f4f26b473..205d233539 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/layouts/AbstractCreateUpdateTagLayout.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/layouts/AbstractCreateUpdateTagLayout.java
@@ -253,16 +253,16 @@ protected void addListeners() {
     private void previewButtonClicked() {
         if (!tagPreviewBtnClicked) {
             final String selectedOption = (String) optiongroup.getValue();
-            if (selectedOption == null || !selectedOption.equalsIgnoreCase(updateTagStr)) {
+            if (selectedOption == null) {
                 return;
             }
 
             if (tagNameComboBox.getValue() == null) {
                 colorPickerLayout
                         .setSelectedColor(ColorPickerHelper.rgbToColorConverter(ColorPickerConstants.DEFAULT_COLOR));
-                return;
+            } else {
+                colorPickerLayout.setSelectedColor(getColorForColorPicker());
             }
-            colorPickerLayout.setSelectedColor(getColorForColorPicker());
         }
 
         tagPreviewBtnClicked = !tagPreviewBtnClicked;