diff --git a/src/init-ceph.in b/src/init-ceph.in
index 4bfbf2878ad..cb340f961de 100644
--- a/src/init-ceph.in
+++ b/src/init-ceph.in
@@ -88,8 +88,7 @@ stop_daemon() {
     action=$5
     [ -z "$action" ] && action="Stopping"
     echo -n "$action Ceph $name on $host..."
-    do_cmd "while [ 1 ]; do
-	[ -e $pidfile ] || break
+    do_cmd "if [ -e $pidfile ] ; then 
 	pid=\`cat $pidfile\`
 	while [ -e /proc/\$pid ] && grep -q $daemon /proc/\$pid/cmdline ; do
 	    cmd=\"kill $signal \$pid\"
@@ -98,8 +97,7 @@ stop_daemon() {
 	    sleep 1
 	    continue
 	done
-	break
-    done"
+    fi"
     echo done
 }