diff --git a/root/etc/cont-init.d/99-custom-files b/root/etc/cont-init.d/99-custom-files
index 6564f21..9c0e18d 100755
--- a/root/etc/cont-init.d/99-custom-files
+++ b/root/etc/cont-init.d/99-custom-files
@@ -30,6 +30,12 @@ if [[ -e "${SCRIPTS_DIR}" ]] && [[ -n "$(/bin/ls -A ${SCRIPTS_DIR} 2>/dev/null)"
             echo "[custom-init] ${NAME}: is not a file"
         fi
     done
+
+    # Remove legacy folder if it's empty
+    if [[ -e "${SCRIPTS_DIR}" ]] && [[ -z "$(/bin/ls -A ${SCRIPTS_DIR} 2>/dev/null)" ]]; then
+        echo "[custom-init] Legacy service folder ${SCRIPTS_DIR} is empty, deleting..."
+        rm -rf "${SCRIPTS_DIR}"
+    fi     
 elif [[ -e "${SCRIPTS_DIR_OLD}" ]] && [[ -n "$(/bin/ls -A ${SCRIPTS_DIR_OLD} 2>/dev/null)" ]]; then
     echo "[custom-init] Files found, executing"
     for SCRIPT in "${SCRIPTS_DIR_OLD}"/*; do