diff --git a/tracker-add-auto.sh b/tracker-add-auto.sh
index a06f330..a490671 100644
--- a/tracker-add-auto.sh
+++ b/tracker-add-auto.sh
@@ -20,7 +20,7 @@ fi
 done
 done
 sleep 3m
-rm /tmp/TTAA.$id.lock
+rm -f /tmp/TTAA.$id.lock
 }
 # Get list of active torrents
     ids="$(transmission-remote --auth="$auth" --list | grep -vE 'Seeding|Stopped|Finished' | grep '^ ' | awk '{ print $1 }')"
diff --git a/transmission-tracker-add.service b/transmission-tracker-add.service
index 14823b5..112f825 100644
--- a/transmission-tracker-add.service
+++ b/transmission-tracker-add.service
@@ -6,6 +6,7 @@ Requires=network.target
 Type=simple
 ExecStart=/opt/bin/add_trackers_auto.sh
 ExecStop=/bin/kill -s TERM $MAINPID
+ExecStopPost=/bin/rm -f /tmp/TTAA.*.lock
 KillMode=control-group
 
 [Install]