diff --git a/src/torrent.cpp b/src/torrent.cpp
index 56109e1af..de58f8e28 100644
--- a/src/torrent.cpp
+++ b/src/torrent.cpp
@@ -10295,11 +10295,14 @@ namespace libtorrent
 		if (m_storage_tick > 0 && is_loaded())
 		{
 			--m_storage_tick;
-			if (m_storage_tick == 0 && m_storage)
+			if (m_storage_tick == 0)
 			{
-				m_ses.disk_thread().async_tick_torrent(&storage()
-					, boost::bind(&torrent::on_disk_tick_done
-						, shared_from_this(), _1));
+				if (m_storage)
+				{
+					m_ses.disk_thread().async_tick_torrent(&storage()
+						, boost::bind(&torrent::on_disk_tick_done
+							, shared_from_this(), _1));
+				}
 				update_want_tick();
 			}
 		}