diff --git a/src/ejabberd_options.erl b/src/ejabberd_options.erl
index 77b76799f..22e5774bb 100644
--- a/src/ejabberd_options.erl
+++ b/src/ejabberd_options.erl
@@ -638,7 +638,7 @@ options() ->
      {s2s_protocol_options, undefined},
      {s2s_queue_type,
       fun(Host) -> ejabberd_config:get_option({queue_type, Host}) end},
-     {s2s_timeout, timer:minutes(10)},
+     {s2s_timeout, timer:hours(1)},
      {s2s_tls_compression, undefined},
      {s2s_use_starttls, false},
      {s2s_zlib, false},
diff --git a/src/ejabberd_options_doc.erl b/src/ejabberd_options_doc.erl
index 64eb850d8..364d1cdac 100644
--- a/src/ejabberd_options_doc.erl
+++ b/src/ejabberd_options_doc.erl
@@ -1149,7 +1149,7 @@ doc() ->
       #{value => "timeout()",
         desc =>
             ?T("A time to wait before closing an idle s2s connection. "
-               "The default value is '10' minutes.")}},
+               "The default value is '1' hour.")}},
      {s2s_use_starttls,
       #{value => "true | false | optional | required",
         desc =>