diff --git a/files/zuul-fingergw.init b/files/zuul-fingergw.init
index c5019ff..380d512 100644
--- a/files/zuul-fingergw.init
+++ b/files/zuul-fingergw.init
@@ -70,18 +70,8 @@ do_start()
 #
 do_stop()
 {
-    # Return
-    #   0 if daemon has been stopped
-    #   1 if daemon was already stopped
-    #   2 if daemon could not be stopped
-    #   other if a failure occurred
-    start-stop-daemon --stop --signal 9 --pidfile $PIDFILE
-    RETVAL="$?"
-    [ "$RETVAL" = 2 ] && return 2
-    if [ -f "$PIDFILE" ] ; then
-        rm -f $PIDFILE
-    fi
-    return "$RETVAL"
+    $DAEMON stop
+    return 0
 }
 
 #