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