diff --git a/client/client.go b/client/client.go
index e4ca3a9..6d57864 100644
--- a/client/client.go
+++ b/client/client.go
@@ -87,6 +87,10 @@ func NewClient(options *Options) *Client {
 		ret.options.Local = true
 	}
 
+	if options.Timeout > 0 {
+		ret.options.Timeout = options.Timeout
+	}
+
 	return ret
 }