diff --git a/src/core/xmpp.py b/src/core/xmpp.py
index d0696ad2..0ebdea01 100644
--- a/src/core/xmpp.py
+++ b/src/core/xmpp.py
@@ -337,6 +337,7 @@ class SatPresenceProtocol(xmppim.PresenceClientProtocol):
         # so we must temporarily switch to wokkel's convention...
         if 'default' in statuses:
             statuses[None] = statuses['default']
+            del statuses['default']
 
         presence_elt = xmppim.AvailablePresence(entity, show, statuses, priority)
         if not self.host.trigger.point("presence_available", presence_elt, self.parent):
@@ -345,6 +346,7 @@ class SatPresenceProtocol(xmppim.PresenceClientProtocol):
 
         # ... before switching back
         if None in statuses:
+            statuses['default'] = statuses[None]
             del statuses[None]
 
     def subscribed(self, entity):