diff --git a/manage.sh b/manage.sh
index 9fd542be..290af9cb 100755
--- a/manage.sh
+++ b/manage.sh
@@ -21,6 +21,7 @@ if [ -f .env ]; then
     key=$(printf '%s' "$key" | sed 's/\r$//' | sed 's/^[[:space:]]*//' | sed 's/[[:space:]]*$//')
     [[ "$key" =~ ^#.*$ || -z "$key" ]] && continue
     value=$(printf '%s' "$value" | sed 's/\r$//' | sed 's/^[[:space:]]*//' | sed 's/[[:space:]]*$//')
+    value="${value/#\~/$HOME}"
     export "$key=$value"
   done < .env
   set +a
@@ -580,6 +581,7 @@ cmd_setup() {
     env_mqtt=$(get_env_value "PROD_MQTT_PORT" ".env")
     env_disable_mosquitto=$(get_env_value "DISABLE_MOSQUITTO" ".env")
     env_data_dir=$(get_env_value "PROD_DATA_DIR" ".env")
+    env_data_dir="${env_data_dir/#\~/$HOME}"
     [ -n "$env_data_dir" ] && selected_data_dir="$env_data_dir"
     [ -n "$env_disable_mosquitto" ] && selected_disable_mosquitto="$env_disable_mosquitto"
     show_env_port_summary "${env_http:-<unset>}" "${env_https:-<unset>}" "${env_mqtt:-<unset>}" "${env_data_dir:-<unset>}" "${env_disable_mosquitto:-<unset>}"