diff --git a/src/torrent.cpp b/src/torrent.cpp
index 44d2e9184..6401f6b0a 100644
--- a/src/torrent.cpp
+++ b/src/torrent.cpp
@@ -9879,11 +9879,19 @@ namespace libtorrent
 
 		clear_error();
 
+		if (m_state == torrent_status::checking_files)
+		{
+			if (m_auto_managed) m_ses.trigger_auto_manage();
+			if (should_check_files()) start_checking();
+		}
+
 		state_updated();
 		update_want_peers();
 		update_want_tick();
 		update_want_scrape();
 
+		if (m_state == torrent_status::checking_files) return;
+
 		start_announcing();
 
 		do_connect_boost();