diff --git a/rw_core/config/config.go b/rw_core/config/config.go
index ad885c2..4375b9b 100644
--- a/rw_core/config/config.go
+++ b/rw_core/config/config.go
@@ -45,6 +45,7 @@
 	RWCoreCA                    string
 	InternalTimeout             time.Duration
 	RPCTimeout                  time.Duration
+	FlowTimeout                 time.Duration
 	MaxConnectionRetries        int
 	ConnectionRetryInterval     time.Duration
 	LiveProbeInterval           time.Duration
@@ -114,6 +115,11 @@
 		5*time.Second,
 		"RPC timeout")
 
+	fs.DurationVar(&(cf.FlowTimeout), //Note flow time out will be considered for flows related rpc's not rpc timeout
+		"flow_timeout",
+		30*time.Second,
+		"Flow timeout")
+
 	fs.BoolVar(&cf.Banner,
 		"banner",
 		false,