diff --git a/include/wa_raft.hrl b/include/wa_raft.hrl
index 52dede3..e2e51a0 100644
--- a/include/wa_raft.hrl
+++ b/include/wa_raft.hrl
@@ -88,7 +88,7 @@
 -define(RAFT_METRICS_MODULE(), ?RAFT_CONFIG(raft_metrics_module)).
 
 %% Default Call timeout for all cross node gen_server:call
--define(RAFT_RPC_CALL_TIMEOUT(), ?RAFT_CONFIG(raft_rpc_call_timeout, 30000)).
+-define(RAFT_RPC_CALL_TIMEOUT(), ?RAFT_CONFIG(raft_rpc_call_timeout, 10000)).
 %% Default call timeout for storage related operation (we need bigger default since storage can be slower)
 -define(RAFT_STORAGE_CALL_TIMEOUT(), ?RAFT_CONFIG(raft_storage_call_timeout, 60000)).
 
diff --git a/src/wa_raft_transport.erl b/src/wa_raft_transport.erl
index fec07c3..8dc9778 100644
--- a/src/wa_raft_transport.erl
+++ b/src/wa_raft_transport.erl
@@ -698,7 +698,7 @@ handle_transport_start(From, Peer, Meta, Root, Counters) ->
 
         % Notify peer node of incoming transport
         FileData = [{FileID, Filename, Size} || {FileID, Filename, _, _, Size} <- Files],
-        case gen_server:call({?MODULE, Peer}, {transport, ID, node(), Module, Meta, FileData}) of
+        case gen_server:call({?MODULE, Peer}, {transport, ID, node(), Module, Meta, FileData}, ?RAFT_RPC_CALL_TIMEOUT()) of
             ok ->
                 % Add all files to the queue
                 ets:insert(Queue, [{FileID} || {FileID, _, _, _, _} <- Files]),