diff --git a/shell/PresenceService/PresenceService.py b/shell/PresenceService/PresenceService.py
index ae7f7e05..c37dc2aa 100644
--- a/shell/PresenceService/PresenceService.py
+++ b/shell/PresenceService/PresenceService.py
@@ -548,8 +548,8 @@ class PresenceService(object):
 		except KeyError:
 			pass
 		else:
+			buddy.remove_service(service)
 			if not buddy.is_valid():
-				buddy.remove_service(service)
 				self._dbus_helper.BuddyDisappeared(buddy.object_path())
 				del self._buddies[buddy_name]
 		key = (service.get_full_name(), service.get_type())