diff --git a/tools/ipfs_setup.sh b/tools/ipfs_setup.sh
index b68fd23d..df280b33 100755
--- a/tools/ipfs_setup.sh
+++ b/tools/ipfs_setup.sh
@@ -31,6 +31,8 @@ MACHINE_TYPE=`uname -m`
 # CHECK if daemon is already running
 if [[ $YOU ]]; then
     echo "ipfs daemon already running...! Run by $YOU $MACHINE_TYPE"
+    [[ $YOU == $USER]] && echo "Stopping ipfs daemon" && killall ipfs \
+                                        || (echo "ERROR $YOU is running ipfs, must be $USER" && exit 1)
 else
     # INIT ipfs
     if [[ ! -d ~/.ipfs ]]; then