diff --git a/spectrum/src/frontends/xmpp/XMPPUserRegistration.cpp b/spectrum/src/frontends/xmpp/XMPPUserRegistration.cpp
index af80b6921262744277fe18e47569b7a3906373b7..e4b5d47212a2e505b3a9927267ae141e21a00762 100644
--- a/spectrum/src/frontends/xmpp/XMPPUserRegistration.cpp
+++ b/spectrum/src/frontends/xmpp/XMPPUserRegistration.cpp
@@ -146,6 +146,7 @@ void XMPPUserRegistration::handleUnregisterRemoteRosterResponse(SWIFTEN_SHRPTR_N
 		// Remote roster is support, so iterate over all buddies we received
 		// from the XMPP server and remove them using remote roster.
 		BOOST_FOREACH(Swift::RosterItemPayload it, payload->getItems()) {
+			if (it.getJID().getDomain() != m_component->getJID().getDomain()) continue;
 			Swift::RosterPayload::ref p = Swift::RosterPayload::ref(new Swift::RosterPayload());
 			Swift::RosterItemPayload item;
 			item.setJID(it.getJID());