diff --git a/bin/mqtt-rpc-client b/bin/mqtt-rpc-client
index cb5004a..d514e0f 100644
--- a/bin/mqtt-rpc-client
+++ b/bin/mqtt-rpc-client
@@ -11,7 +11,7 @@ import paho_socket
 from jsonrpc.exceptions import JSONRPCError
 from paho.mqtt import client as mqttclient
 
-from mqttrpc.client import MQTTRPCError, TMQTTRPCClient
+from mqttrpc.client import MQTTRPCError, TimeoutError, TMQTTRPCClient
 
 
 def main():
@@ -28,7 +28,7 @@ def main():
     parser.add_argument("-s", "--service", dest="service", type=str, help="Service name")
     parser.add_argument("-m", "--method", dest="method", type=str, help="Method name")
     parser.add_argument("-a", "--args", dest="args", type=json.loads, help="Method arguments")
-    parser.add_argument("-t", "--timeout", dest="timeout", type=int, help="Timeout", default=10)
+    parser.add_argument("-t", "--timeout", dest="timeout", type=int, help="Timeout in seconds", default=10)
     args = parser.parse_args()
 
     url = urlparse(args.broker_url)
@@ -54,6 +54,8 @@ def main():
         pprint.pprint(resp)
     except MQTTRPCError as e:
         print("Error: %s" % e)
+    except TimeoutError:
+        print("Request timed out")
 
 
 if __name__ == "__main__":
diff --git a/debian/changelog b/debian/changelog
index 92df52b..98d5d76 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+python-mqttrpc (1.1.8) stable; urgency=medium
+
+  * mqtt-rpc-client: fix timeout handling
+
+ -- Nikolay Korotkiy <nikolay.korotkiy@wirenboard.com>  Wed, 15 Feb 2023 13:15:00 +0400
+
 python-mqttrpc (1.1.7) stable; urgency=medium
 
   * mqtt-rpc-client: fix error response handling