diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py
index 93500dd79..3709cd7bf 100755
--- a/synapse/app/homeserver.py
+++ b/synapse/app/homeserver.py
@@ -372,6 +372,7 @@ def setup(config_options):
         db_config.setdefault("args", {}).update({
             "cp_min": 1,
             "cp_max": 1,
+            "check_same_thread": False,
         })
     else:
         raise RuntimeError("Unsupported database type '%s'" % (name,))