diff --git a/libtorrent/src/session_impl.cpp b/libtorrent/src/session_impl.cpp
index 7a893e8fe..a77b60c9c 100755
--- a/libtorrent/src/session_impl.cpp
+++ b/libtorrent/src/session_impl.cpp
@@ -1089,17 +1089,12 @@ namespace detail
 				{
 					if (p->is_choked())
 					{
-						if (t->unchoke_peer(*p))
-						{
-							--unchoke_set_size;
-							++m_num_unchoked;
-						}
-					}
-					else
-					{
-						--unchoke_set_size;
-						++m_num_unchoked;
+						if (!t->unchoke_peer(*p))
+							continue;
 					}
+	
+					--unchoke_set_size;
+					++m_num_unchoked;
 
 					assert(p->peer_info_struct());
 					if (p->peer_info_struct()->optimistically_unchoked)