diff --git a/scripts/dist/remove-wait-online.sh b/scripts/dist/remove-wait-online.sh
new file mode 100755
index 000000000..981594397
--- /dev/null
+++ b/scripts/dist/remove-wait-online.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+# This script disables the wait-online service to prevent the system from waiting for a network connection.
+# bash <(curl -s https://raw.githubusercontent.com/photoprism/photoprism/develop/scripts/dist/remove-wait-online.sh)
+
+set -e
+
+echo "Disabling the wait-online service..."
+
+sudo systemctl disable systemd-networkd-wait-online.service && \
+  sudo systemctl mask systemd-networkd-wait-online.service
+
+echo "Done."