diff --git a/src/ejabberd_options.erl b/src/ejabberd_options.erl
index 75a0caa8e..787d03628 100644
--- a/src/ejabberd_options.erl
+++ b/src/ejabberd_options.erl
@@ -606,7 +606,7 @@ options() ->
      {log_modules_fully, []},
      {max_fsm_queue, undefined},
      {modules, []},
-     {negotiation_timeout, timer:seconds(30)},
+     {negotiation_timeout, timer:seconds(120)},
      {net_ticktime, timer:seconds(60)},
      {new_sql_schema, ?USE_NEW_SQL_SCHEMA_DEFAULT},
      {update_sql_schema, false},