diff --git a/src/metadata_transfer.cpp b/src/metadata_transfer.cpp
index 6491f068f..6520286fd 100644
--- a/src/metadata_transfer.cpp
+++ b/src/metadata_transfer.cpp
@@ -476,6 +476,8 @@ namespace libtorrent { namespace
 
 		virtual void tick()
 		{
+			if (m_pc.is_disconnecting()) return;
+
 			// if we don't have any metadata, and this peer
 			// supports the request metadata extension
 			// and we aren't currently waiting for a request