diff --git a/src/libtomahawk/accounts/AccountManager.cpp b/src/libtomahawk/accounts/AccountManager.cpp
index 6800be04d..065667a88 100644
--- a/src/libtomahawk/accounts/AccountManager.cpp
+++ b/src/libtomahawk/accounts/AccountManager.cpp
@@ -420,7 +420,8 @@ AccountManager::configStorageForAccount( const QString& accountId )
         if ( cs->accountIds().contains( accountId ) )
             return cs;
     }
-    return 0;
+    tLog() << "Warning: defaulting to LocalConfigStorage for account" << accountId;
+    return localConfigStorage();
 }