diff --git a/src/localbuddy.cpp b/src/localbuddy.cpp
index 0c43b8a39a228e8ad85f6a0cf5bb19d5a0d6a094..ce64ad87e768d4d5df7fcbbcdac9786aa4abb8a5 100644
--- a/src/localbuddy.cpp
+++ b/src/localbuddy.cpp
@@ -35,7 +35,9 @@ void LocalBuddy::setAlias(const std::string &alias) {
 	m_alias = alias;
 
 	if (changed) {
-		getRosterManager()->sendBuddyRosterPush(this);
+		if (getRosterManager()->getUser()->getComponent()->inServerMode() || getRosterManager()->isRemoteRosterSupported()) {
+			getRosterManager()->sendBuddyRosterPush(this);
+		}
 		getRosterManager()->storeBuddy(this);
 	}
 }