diff --git a/src/rostermanager.cpp b/src/rostermanager.cpp
index daabf440..1cfedd0f 100644
--- a/src/rostermanager.cpp
+++ b/src/rostermanager.cpp
@@ -282,14 +282,12 @@ void RosterManager::handleRemoteRosterResponse(boost::shared_ptr<Swift::RosterPa
 	m_supportRemoteRoster = true;
 
 	//If we receive empty RosterPayload on login (not register) initiate full RosterPush
-	if(!m_buddies.empty()){
-		if(payload->getItems().empty()){
+	if(!m_buddies.empty() && payload->getItems().empty()){
 			LOG4CXX_INFO(logger, "Received empty Roster upon login. Pushing full Roster.");
 			for(std::map<std::string, Buddy *, std::less<std::string>, boost::pool_allocator< std::pair<std::string, Buddy *> > >::const_iterator c_it = m_buddies.begin();
 					c_it != m_buddies.end(); c_it++) {
 				sendBuddyRosterPush(c_it->second);
 			}
-		}
 	}
 	return;