diff --git a/tools/addRoomsToDirectory.ts b/tools/addRoomsToDirectory.ts
index 6b06ac7b9324bd9d3fe3a2fde04edcc98b250db7..b7afc51fc1ded4862ed78e90f223bfaad8336b63 100644
--- a/tools/addRoomsToDirectory.ts
+++ b/tools/addRoomsToDirectory.ts
@@ -67,7 +67,7 @@ if (options.help) {
     process.exit(0);
 }
 
-const {store, appservice} = ToolsHelper.getToolDependencies(options.config, options.registration);
+const {store, appservice} = ToolsHelper.getToolDependencies(options.config, options.registration, true);
 
 async function run(): Promise<void> {
     try {
diff --git a/tools/adminme.ts b/tools/adminme.ts
index 06e756da26241b9f5a589d5c66b76a44178041c8..3235578e17c2937dfd772e808ed4db457862c2e8 100644
--- a/tools/adminme.ts
+++ b/tools/adminme.ts
@@ -95,7 +95,7 @@ if (!options.userid) {
     process.exit(1);
 }
 
-const {appservice} = ToolsHelper.getToolDependencies(options.config, options.reg, false);
+const {appservice} = ToolsHelper.getToolDependencies(options.config, options.registration, false);
 
 async function run() {
     try {
diff --git a/tools/chanfix.ts b/tools/chanfix.ts
index 5c186c61419a99a0e5889b90925969f147fc8c99..b46ec1b6c8c647d997137f2498d83f4c50b9caab 100644
--- a/tools/chanfix.ts
+++ b/tools/chanfix.ts
@@ -67,7 +67,7 @@ if (options.help) {
 }
 
 async function run() {
-    const {store, appservice, config} = ToolsHelper.getToolDependencies(options.config);
+    const {store, appservice, config} = ToolsHelper.getToolDependencies(options.config, options.registration);
     await store!.init();
     const discordbot = new DiscordBot(config, appservice, store!);
     await discordbot.init();
diff --git a/tools/ghostfix.ts b/tools/ghostfix.ts
index d5f6b40683e27d6910b6f24ffa68a6670dbfc12a..5f00977b48df7592c3f528cdcf65d6b9624aab81 100644
--- a/tools/ghostfix.ts
+++ b/tools/ghostfix.ts
@@ -76,7 +76,7 @@ if (options.help) {
 }
 
 async function run() {
-    const {store, appservice, config} = ToolsHelper.getToolDependencies(options.config);
+    const {appservice, config, store} = ToolsHelper.getToolDependencies(options.config, options.registration);
     await store!.init();
     const discordbot = new DiscordBot(config, appservice, store!);
     await discordbot.init();
diff --git a/tools/toolshelper.ts b/tools/toolshelper.ts
index 1bd3c49b317d94203cc5b45d677d9acb99bc40b8..954afaad4d07738c2df59c566df921d0c0994a4c 100644
--- a/tools/toolshelper.ts
+++ b/tools/toolshelper.ts
@@ -28,7 +28,7 @@ export class ToolsHelper {
             registration: registration as IAppserviceRegistration,
         });
 
-        const store = needsStore ? new DiscordStore(config.database ? config.database.filename : "discord.db") : null;
+        const store = needsStore ? new DiscordStore(config.database) : null;
         return {
             appservice,
             config,