diff --git a/src/peer_connection.cpp b/src/peer_connection.cpp
index b9a961bb4..8944b5ef1 100644
--- a/src/peer_connection.cpp
+++ b/src/peer_connection.cpp
@@ -4512,7 +4512,7 @@ namespace libtorrent
 
 		bool sent_a_piece = false;
 		boost::shared_ptr<torrent> t = m_torrent.lock();
-		if (!t) return;
+		if (!t || t->is_aborted()) return;
 
 		// only add new piece-chunks if the send buffer is small enough
 		// otherwise there will be no end to how large it will be!