diff --git a/src/core/xmpp.py b/src/core/xmpp.py
index b5c7202c..aba6bae8 100644
--- a/src/core/xmpp.py
+++ b/src/core/xmpp.py
@@ -364,15 +364,16 @@ class SatPresenceProtocol(xmppim.PresenceClientProtocol):
             del statuses['default']
 
         presence_elt = xmppim.AvailablePresence(entity, show, statuses, priority)
-        if not self.host.trigger.point("presence_available", presence_elt, self.parent):
-            return
-        self.send(presence_elt)
 
         # ... before switching back
         if None in statuses:
             statuses['default'] = statuses[None]
             del statuses[None]
 
+        if not self.host.trigger.point("presence_available", presence_elt, self.parent):
+            return
+        self.send(presence_elt)
+
     def subscribed(self, entity):
         xmppim.PresenceClientProtocol.subscribed(self, entity)
         self.host.memory.delWaitingSub(entity.userhost(), self.parent.profile)