diff --git a/src/common/connection.py b/src/common/connection.py
index 418c1694e..ff8556417 100644
--- a/src/common/connection.py
+++ b/src/common/connection.py
@@ -1616,7 +1616,8 @@ class Connection(CommonConnection, ConnectionHandlers):
         if not gajim.account_is_connected(self.name):
             return
         self.connection.set_send_timeout(self.keepalives, self.send_keepalive)
-        self.connection.set_send_timeout2(self.pingalives, self.sendPing)
+        self.connection.set_send_timeout2(self.pingalives,
+        	self.sm.enabled and self.sm.request_ack or self.sendPing)
         self.connection.onreceive(None)
 
         self.privacy_rules_requested = False