diff --git a/debian/freeswitch-systemd.freeswitch.service b/debian/freeswitch-systemd.freeswitch.service
index 3a734e3b37..5612b21398 100644
--- a/debian/freeswitch-systemd.freeswitch.service
+++ b/debian/freeswitch-systemd.freeswitch.service
@@ -11,7 +11,7 @@ PIDFile=/run/freeswitch/freeswitch.pid
 PermissionsStartOnly=true
 ExecStartPre=/bin/mkdir -p /run/freeswitch
 ExecStartPre=/bin/chown freeswitch:freeswitch /run/freeswitch
-ExecStart=/usr/bin/freeswitch -nc -nonat
+ExecStart=/usr/bin/freeswitch -ncwait -nonat
 TimeoutSec=45s
 Restart=always
 ; exec
diff --git a/debian/freeswitch-sysvinit.freeswitch.init b/debian/freeswitch-sysvinit.freeswitch.init
index fda8c4bd3e..4f60ada4c0 100644
--- a/debian/freeswitch-sysvinit.freeswitch.init
+++ b/debian/freeswitch-sysvinit.freeswitch.init
@@ -18,7 +18,7 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin
 DESC=freeswitch
 NAME=freeswitch
 DAEMON=/usr/bin/freeswitch
-DAEMON_ARGS="-u freeswitch -g freeswitch -nc"
+DAEMON_ARGS="-u freeswitch -g freeswitch -ncwait"
 USER=freeswitch
 GROUP=freeswitch
 CONFDIR=/etc/$NAME