diff --git a/synapse/handlers/auth.py b/synapse/handlers/auth.py
index 7f8ddc99c6bd024f7aa431c6c2eff86257e5cf00..a0cf37a9f9e08b3d427929ad15c8eb3715c92375 100644
--- a/synapse/handlers/auth.py
+++ b/synapse/handlers/auth.py
@@ -479,6 +479,7 @@ class AuthHandler(BaseHandler):
                 medium,
                 threepid_creds["client_secret"],
                 sid=threepid_creds["sid"],
+                validated=True,
             )
 
             threepid = {
diff --git a/synapse/storage/registration.py b/synapse/storage/registration.py
index 9b41cbd757efedf7d96a9a6187f600b8668c0d7d..1dd1182e82cb4f3def656b3cdf066a5d21c3731f 100644
--- a/synapse/storage/registration.py
+++ b/synapse/storage/registration.py
@@ -998,7 +998,7 @@ class RegistrationStore(
         client_secret,
         address=None,
         sid=None,
-        validated=None,
+        validated=True,
     ):
         """Gets a session_id and last_send_attempt (if available) for a
         client_secret/medium/(address|session_id) combo