diff --git a/slixmpp_omemo/__init__.py b/slixmpp_omemo/__init__.py
index 993be34..2f98e09 100644
--- a/slixmpp_omemo/__init__.py
+++ b/slixmpp_omemo/__init__.py
@@ -654,7 +654,7 @@ class XEP_0384(BasePlugin):
         finally:
             asyncio.ensure_future(self._publish_bundle())
 
-        if self.auto_heartbeat and self.should_heartbeat():
+        if self.auto_heartbeat and self.should_heartbeat(jid):
             async def send_heartbeat():
                 msg = await self.make_heartbeat(JID(jid))
                 msg.send()