diff --git a/src/components/client.ts b/src/components/client.ts
index debe5380..99bd930d 100644
--- a/src/components/client.ts
+++ b/src/components/client.ts
@@ -52,7 +52,7 @@ export class <%= className %> {
     | PostMessageWindowTransport
     | PostMessageIframeTransport;
   private validator: MethodCallValidator | undefined;
-  private timeout: number | undefined;
+  private timeout: number | null | undefined;
 
   constructor(options: Options) {
     if (
@@ -131,9 +131,9 @@ export class <%= className %> {
    * // 20s timeout
    * myClient.setDefaultTimeout(20000);
    * // Removes timeout from request
-   * myClient.setDefaultTimeout(undefined);
+   * myClient.setDefaultTimeout(null);
    */
-  public setDefaultTimeout(ms?: number) {
+  public setDefaultTimeout(ms?: number | null) {
     this.timeout = ms;
   }
 
diff --git a/src/custom-test-component.js b/src/custom-test-component.js
index f68a9b7c..f7255e73 100644
--- a/src/custom-test-component.js
+++ b/src/custom-test-component.js
@@ -29,7 +29,7 @@ export class <%= className %> {
   public static openrpcDocument: OpenRPC = <%= JSON.stringify(openrpcDocument) %> ;
   public transport: HTTPTransport | WebSocketTransport | PostMessageWindowTransport | PostMessageIframeTransport;
   private validator: MethodCallValidator;
-  private timeout: number | undefined;
+  private timeout: number | null | undefined;
 
   constructor(options: Options) {
 
@@ -86,9 +86,9 @@ export class <%= className %> {
    * // 20s timeout
    * myClient.setDefaultTimeout(20000);
    * // Removes timeout from request
-   * myClient.setDefaultTimeout(undefined);
+   * myClient.setDefaultTimeout(null);
    */
-   public setDefaultTimeout(ms?: number) {
+   public setDefaultTimeout(ms?: number | null) {
     this.timeout = ms;
   }