diff --git a/tracker-add-auto.sh b/tracker-add-auto.sh
index bd0278d..a06f330 100644
--- a/tracker-add-auto.sh
+++ b/tracker-add-auto.sh
@@ -23,7 +23,7 @@ sleep 3m
 rm /tmp/TTAA.$id.lock
 }
 # Get list of active torrents
-    ids="$(transmission-remote --auth="$auth" --list | grep -E 'Downloading' | grep '^ ' | awk '{ print $1 }')"
+    ids="$(transmission-remote --auth="$auth" --list | grep -vE 'Seeding|Stopped|Finished' | grep '^ ' | awk '{ print $1 }')"
     for id in $ids ; do
 add_date="$(transmission-remote --auth="$auth"  --torrent "$id" --info| grep '^  Date added: ' |cut -c 21-)"
 add_date_t="$(date -d "$add_date" "+%Y-%m-%d %H:%M")"
diff --git a/transmission-tracker-add.service b/transmission-tracker-add.service
index ea64815..14823b5 100644
--- a/transmission-tracker-add.service
+++ b/transmission-tracker-add.service
@@ -3,9 +3,10 @@ Description=transmission tracker add
 Requires=network.target
 
 [Service]
-Type=forked
+Type=simple
 ExecStart=/opt/bin/add_trackers_auto.sh
-Restart=always
+ExecStop=/bin/kill -s TERM $MAINPID
+KillMode=control-group
 
 [Install]
 WantedBy=multi-user.target