diff --git a/metrics/scripts/stop.sh b/metrics/scripts/stop.sh
index 99d28b3ba..72e43383f 100755
--- a/metrics/scripts/stop.sh
+++ b/metrics/scripts/stop.sh
@@ -6,15 +6,14 @@
 cd "$(dirname "$0")"
 
 for container in influxdb grafana; do
-  if [ "$(docker ps -q -f name=$container)" ]; then
+  if [ "$(docker ps -q -a -f name=$container)" ]; then
   (
     set +e
-    docker kill $container
-    docker rm $container
+    docker rm -f $container
     exit 0
   )
   fi
- done
+done
 
- echo Local metrics stopped
- exit 0
\ No newline at end of file
+echo Local metrics stopped
+exit 0
\ No newline at end of file