diff --git a/src/common/connection_handlers.py b/src/common/connection_handlers.py
index 66f57e1fd..9cee76b0e 100644
--- a/src/common/connection_handlers.py
+++ b/src/common/connection_handlers.py
@@ -463,7 +463,10 @@ class ConnectionBytestream:
 			raise common.xmpp.NodeProcessed
 
 		if real_id[:3] == 'au_':
-			gajim.socks5queue.send_file(file_props, self.name)
+			if file_props['stopped']:
+				self.remove_transfer(file_props)
+			else:
+				gajim.socks5queue.send_file(file_props, self.name)
 			raise common.xmpp.NodeProcessed
 
 		proxy = None
@@ -485,7 +488,10 @@ class ConnectionBytestream:
 			raise common.xmpp.NodeProcessed
 
 		else:
-			gajim.socks5queue.send_file(file_props, self.name)
+			if file_props['stopped']:
+				self.remove_transfer(file_props)
+			else:
+				gajim.socks5queue.send_file(file_props, self.name)
 			if file_props.has_key('fast'):
 				fasts = file_props['fast']
 				if len(fasts) > 0: