1 files changed, 5 insertions, 1 deletions
diff --git a/src/rabbit_control_main.erl b/src/rabbit_control_main.erl
index f211e4326c..82c8d80a98 100644
--- a/src/rabbit_control_main.erl
+++ b/src/rabbit_control_main.erl
@@ -201,7 +201,11 @@ parse_timeout(infinity) ->
 parse_timeout(N) when is_list(N) ->
     try parse_number(N) of
         M ->
-            {ok, round(M) * 1000}
+            Y = case M >= 0 of
+                    true  -> round(M) * 1000;
+                    false -> ?RPC_TIMEOUT
+                end,
+            {ok, Y}
     catch error:badarg ->
         {error, infinity}
     end;