diff --git a/ChangeLog b/ChangeLog
index b8e2bd3ea..710be2ac0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -86,6 +86,8 @@ release 0.14.8
 
 	* ignore unkown metadata messages
 	* fixed typo that would sometimes prevent queued torrents to be checked
+	* fixed bug in auto-manager where active_downloads and active_seeds would
+	  sometimes be used incorrectly
 
 release 0.14.7
 
diff --git a/src/session_impl.cpp b/src/session_impl.cpp
index 8ab1d451a..67319bada 100644
--- a/src/session_impl.cpp
+++ b/src/session_impl.cpp
@@ -1813,8 +1813,10 @@ namespace aux {
 					// this is not an auto managed torrent,
 					// if it's running and active, decrease the
 					// counters.
-					--num_downloaders;
-					--num_seeds;
+					if (t->is_finished())
+						--num_seeds;
+					else
+						--num_downloaders;
 				}
 			}
 		}