diff --git a/packaging/tools/remove.sh b/packaging/tools/remove.sh
index 5bbfd2a0de..43c2de4ba4 100755
--- a/packaging/tools/remove.sh
+++ b/packaging/tools/remove.sh
@@ -90,7 +90,7 @@ fi
 
 kill_service_of() {
   _service=$1
-  pid=$(ps -C $_service | grep -v $uninstallScript | awk '{print $2}')
+  pid=$(ps -C $_service | grep -w $_service | grep -v $uninstallScript | awk '{print $1}')
   if [ -n "$pid" ]; then
     ${csudo}kill -9 $pid || :
   fi
@@ -140,9 +140,8 @@ clean_service_of() {
     clean_service_on_systemd_of $_service
   elif ((${service_mod} == 1)); then
     clean_service_on_sysvinit_of $_service
-  else
-    kill_service_of $_service
   fi
+  kill_service_of $_service
 }
 
 remove_service_of() {
diff --git a/packaging/tools/remove_client.sh b/packaging/tools/remove_client.sh
index 7798bbf16a..1d2965f66b 100755
--- a/packaging/tools/remove_client.sh
+++ b/packaging/tools/remove_client.sh
@@ -40,7 +40,7 @@ if command -v sudo > /dev/null; then
 fi
 
 function kill_client() {
-    pid=$(ps -C ${clientName2}  | grep -v $uninstallScript2 | awk '{print $2}')
+    pid=$(ps -C ${clientName2} | grep -w ${clientName2} | grep -v $uninstallScript2 | awk '{print $1}')
     if [ -n "$pid" ]; then
         ${csudo}kill -9 $pid || :
     fi