diff --git a/scripts/run-dev.sh b/scripts/run-dev.sh
index 11ef0f4811..53cbbb711f 100755
--- a/scripts/run-dev.sh
+++ b/scripts/run-dev.sh
@@ -3,6 +3,9 @@ set -euo pipefail
 
 ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
 
+# Clear stale daemon socket to ensure standalone mode
+unset AGENT_CORE_IPC_SOCKET
+
 export AGENT_CORE_ROOT="$ROOT"
 export AGENT_CORE_SOURCE="$ROOT"
 
diff --git a/scripts/run-dist.sh b/scripts/run-dist.sh
index a43355b885..7f23d98e92 100755
--- a/scripts/run-dist.sh
+++ b/scripts/run-dist.sh
@@ -3,6 +3,9 @@ set -euo pipefail
 
 ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
 
+# Clear stale daemon socket to ensure standalone mode
+unset AGENT_CORE_IPC_SOCKET
+
 TARGET="${AGENT_CORE_TARGET:-}"
 if [[ -z "$TARGET" ]]; then
   os="$(uname -s | tr '[:upper:]' '[:lower:]')"