diff --git a/src/session_impl.cpp b/src/session_impl.cpp
index b5cc97486..5f28c8832 100644
--- a/src/session_impl.cpp
+++ b/src/session_impl.cpp
@@ -1528,7 +1528,8 @@ namespace aux {
 					&& !p->is_disconnecting()
 					&& p->is_peer_interested()
 					&& t->free_upload_slots()
-					&& p->is_choked())
+					&& p->is_choked()
+					&& t->valid_metadata())
 				{
 					last_unchoke = pi->last_optimistically_unchoked;
 					optimistic_unchoke_candidate = i;