diff --git a/oslo_messaging/_drivers/impl_rabbit.py b/oslo_messaging/_drivers/impl_rabbit.py
index 75041cd8a..60c84c52b 100644
--- a/oslo_messaging/_drivers/impl_rabbit.py
+++ b/oslo_messaging/_drivers/impl_rabbit.py
@@ -1005,7 +1005,7 @@ class Connection(object):
         # TODO(sileht): use @retrying
         # NOTE(sileht): no need to wait the application expect a response
         # before timeout is exshauted
-        duration = (timeout if timeout is None
+        duration = (timeout if timeout is not None
                     else self.conf.rpc_response_timeout)
 
         timer = rpc_common.DecayingTimer(duration=duration)