diff --git a/misc/build.func b/misc/build.func
index 101d919b..0810e501 100644
--- a/misc/build.func
+++ b/misc/build.func
@@ -629,9 +629,14 @@ advanced_settings() {
 
   if ADV_TAGS=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set Custom Tags?[If you remove all, there will be no tags!]" 8 58 ${TAGS} --title "Advanced Tags" 3>&1 1>&2 2>&3); then
     if [ -n "${ADV_TAGS}" ]; then
-        ADV_TAGS=${ADV_TAGS:-""} 
-        ADV_TAGS=$(echo "$ADV_TAGS" | tr -d '[:space:]')
+      ADV_TAGS=$(echo "$ADV_TAGS" | tr -d '[:space:]') # Remove whitespace from ADV_TAGS
+      if [[ "$ADV_TAGS" != *"community-script"* ]]; then
         TAGS="community-script;${ADV_TAGS}"
+      else
+        TAGS="${ADV_TAGS}" # ADV_TAGS already contains "community-script"
+      fi
+    else
+      TAGS=""
     fi
       echo -e "${NETWORK}${BOLD}${DGN}Tags: ${BGN}$TAGS${CL}"
     else