diff --git a/config/config.example.toml b/config/config.example.toml
index 601d07059ab..4e76895e192 100644
--- a/config/config.example.toml
+++ b/config/config.example.toml
@@ -55,7 +55,8 @@ stream_read_count = 1      # Default number of entries to read from stream if no
 auto_pipeline = true       # Whether or not the client should automatically pipeline commands across tasks when possible.
 disable_auto_backpressure = false # Whether or not to disable the automatic backpressure features when pipelining is enabled.
 max_in_flight_commands = 5000 # The maximum number of in-flight commands (per connection) before backpressure will be applied.
-default_command_timeout = 30  # An optional timeout to apply to all commands.
+default_command_timeout = 30  # An optional timeout to apply to all commands. In seconds
+unresponsive_timeout = 10 # An optional timeout for Unresponsive commands in seconds. This should be less than default_command_timeout.
 max_feed_count = 200       # The maximum number of frames that will be fed to a socket before flushing.
 
 # This section provides configs for currency conversion api
diff --git a/config/development.toml b/config/development.toml
index 05e7228d104..827793756c1 100644
--- a/config/development.toml
+++ b/config/development.toml
@@ -45,6 +45,7 @@ auto_pipeline = true
 disable_auto_backpressure = false
 max_in_flight_commands = 5000
 default_command_timeout = 30
+unresponsive_timeout = 10
 max_feed_count = 200
 
 
diff --git a/config/docker_compose.toml b/config/docker_compose.toml
index 705882c95d1..22dfbc5ca0c 100644
--- a/config/docker_compose.toml
+++ b/config/docker_compose.toml
@@ -78,6 +78,7 @@ auto_pipeline = true
 disable_auto_backpressure = false
 max_in_flight_commands = 5000
 default_command_timeout = 30
+unresponsive_timeout = 10
 max_feed_count = 200