diff --git a/synapse/federation/transport/client.py b/synapse/federation/transport/client.py
index 5e8bf8ac76..42ed61470f 100644
--- a/synapse/federation/transport/client.py
+++ b/synapse/federation/transport/client.py
@@ -175,6 +175,7 @@ class TransportLayerClient(object):
             data=json_data,
             json_data_callback=json_data_callback,
             long_retries=False,
+            timeout=10000,
             backoff_on_404=True,  # If we get a 404 the other side has gone
         )
 
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index c37a3b8dca..c9fefeb087 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -424,7 +424,7 @@ class FederationHandler(BaseHandler):
                     )
 
         now = self.clock.time_msec()
-        if now - pdu.origin_server_ts > 2 * 60 * 1000:
+        if now - pdu.origin_server_ts > 1 * 60 * 1000:
             pass
         else:
             thread_id = 0