diff --git a/src/rostermanager.cpp b/src/rostermanager.cpp
index 8177ca35023c3b1ed14c2e9b1495f4823dc55da0..b2f34b28c814cea97120ce5a3482a72db8e48761 100644
--- a/src/rostermanager.cpp
+++ b/src/rostermanager.cpp
@@ -161,7 +161,7 @@ void RosterManager::handleSubscription(Swift::Presence::ref presence) {
 }
 
 void RosterManager::setStorageBackend(StorageBackend *storageBackend) {
-	if (m_rosterStorage) {
+	if (m_rosterStorage || !storageBackend) {
 		return;
 	}
 	m_rosterStorage = new RosterStorage(m_user, storageBackend);