diff --git a/src/database/globals.rs b/src/database/globals.rs
index e48c8491..fd51e355 100644
--- a/src/database/globals.rs
+++ b/src/database/globals.rs
@@ -52,7 +52,11 @@ impl ServerCertVerifier for MatrixServerVerifier {
             },
             None => dns_name
         };
-        self.inner.verify_server_cert(roots, presented_certs, override_name, ocsp_response)
+
+        self.inner.verify_server_cert(roots, presented_certs, override_name, ocsp_response).or_else(|_| {
+            log::warn!("Server is non-compliant, retrying with original name!");
+            self.inner.verify_server_cert(roots, presented_certs, dns_name, ocsp_response)
+        })
     }
 }