diff --git a/modules/matrix/mautrix-signal.nix b/modules/matrix/mautrix-signal.nix
index 228d4e9..e4b50d1 100644
--- a/modules/matrix/mautrix-signal.nix
+++ b/modules/matrix/mautrix-signal.nix
@@ -14,12 +14,15 @@ lib.mkIf cfg.mautrix-signal.enable {
         address = synapseCfg.public_baseurl;
         domain = synapseCfg.server_name;
       };
+      database = {
+        type = "sqlite3-fk-wal";
+        uri = "file:${dataDir}/mautrix-signal.db?_txlock=immediate";
+      };
       appservice = rec {
         hostname = "127.0.0.1";
         inherit (cfg.mautrix-signal) port;
         address = "http://${hostname}:${toString port}";
         provisioning.shared_secret = "disable";
-        database = "sqlite:///${dataDir}/mautrix-signal.db";
       };
       bridge = {
         encryption = {
diff --git a/modules/matrix/mautrix-whatsapp.nix b/modules/matrix/mautrix-whatsapp.nix
index d4438fe..7225227 100644
--- a/modules/matrix/mautrix-whatsapp.nix
+++ b/modules/matrix/mautrix-whatsapp.nix
@@ -8,20 +8,20 @@ lib.mkIf cfg.mautrix-whatsapp.enable {
   services.mautrix-whatsapp = {
     enable = true;
     registerToSynapse = true;
-    settings = {
+    settings = lib.mkForce ({
       homeserver = {
         address = synapseCfg.public_baseurl;
         domain = synapseCfg.server_name;
       };
+      database = {
+        type = "sqlite3-fk-wal";
+        uri = "file:/var/lib/mautrix-whatsapp/mautrix-whatsapp.db?_txlock=immediate";
+      };
       appservice = rec {
         hostname = "127.0.0.1";
         inherit (cfg.mautrix-whatsapp) port;
         address = "http://${hostname}:${toString port}";
         provisioning.shared_secret = "disable";
-        database = {
-          type = "sqlite3";
-          uri = "/var/lib/mautrix-whatsapp/mautrix-whatsapp.db";
-        };
         id = "whatsapp";
         bot = {
           username = "whatsappbot";
@@ -46,9 +46,17 @@ lib.mkIf cfg.mautrix-whatsapp.enable {
         relay.enable = false;
       };
       logging = {
-        print_level = "info";
         file_name_format = null;
+        min_level = "info";
+        print_level = "info";
+        writers = [
+          {
+            format = "pretty-colored";
+            time_format = " ";
+            type = "stdout";
+          }
+        ];
       };
-    } // cfg.mautrix-whatsapp.settings;
+    } // cfg.mautrix-whatsapp.settings);
   };
 }