diff --git a/src/rosterresponder.cpp b/src/rosterresponder.cpp
index 9c0be47d3be66a033f55f09c158f6e0d8dbcbd8f..6bc496c1933703140c0d8ce5fce41a3967211c65 100644
--- a/src/rosterresponder.cpp
+++ b/src/rosterresponder.cpp
@@ -74,6 +74,10 @@ bool RosterResponder::handleSetRequest(const Swift::JID& from, const Swift::JID&
 
 	Swift::RosterItemPayload item = payload->getItems()[0];
 
+	if (item.getJID().getNode().empty()) {
+		return true;
+	}
+
 	Buddy *buddy = user->getRosterManager()->getBuddy(Buddy::JIDToLegacyName(item.getJID()));
 	if (buddy) {
 		if (item.getSubscription() == Swift::RosterItemPayload::Remove) {