diff --git a/src/storagebackend.cpp b/src/storagebackend.cpp
index 2247dee9..ec87e33b 100644
--- a/src/storagebackend.cpp
+++ b/src/storagebackend.cpp
@@ -10,8 +10,7 @@ namespace Transport {
 StorageBackend *StorageBackend::createBackend(Config *config, std::string &error) {
 	StorageBackend *storageBackend = NULL;
 #ifdef WITH_SQLITE
-	if (CONFIG_STRING(config, "database.type") == "sqlite3" ||
-		(CONFIG_STRING(config, "database.type") == "none" && !CONFIG_BOOL(config, "service.server_mode"))) {
+	if (CONFIG_STRING(config, "database.type") == "sqlite3") {
 		storageBackend = new SQLite3Backend(config);
 	}
 #else