diff --git a/src/browserContext.ts b/src/browserContext.ts
index 203c082154..864fd77448 100644
--- a/src/browserContext.ts
+++ b/src/browserContext.ts
@@ -93,7 +93,7 @@ export class BrowserContext extends platform.EventEmitter {
   }
 
   setDefaultDelay(delay: number) {
-    this._delaySettings.setDefaultDelay(delay === 0 ? null : delay);
+    this._delaySettings.setDefaultDelay(delay);
   }
 
   async pages(): Promise<Page[]> {
diff --git a/src/delaySettings.ts b/src/delaySettings.ts
index 4b4d75cb90..3e6fb3bb38 100644
--- a/src/delaySettings.ts
+++ b/src/delaySettings.ts
@@ -23,8 +23,11 @@ export class DelaySettings {
     this._parent = parent;
   }
 
-  setDefaultDelay(delay: null | number) {
-    this._defaultDelay = delay;
+  setDefaultDelay(delay: number) {
+    if (delay === 0)
+      this._defaultDelay = null;
+    else
+      this._defaultDelay = delay;
   }
 
   delay(): null | number {
diff --git a/src/page.ts b/src/page.ts
index 45feeceec9..412e184b27 100644
--- a/src/page.ts
+++ b/src/page.ts
@@ -211,7 +211,7 @@ export class Page extends platform.EventEmitter {
   }
 
   setDefaultDelay(delay: number) {
-    this._delaySettings.setDefaultDelay(delay === 0 ? null : delay);
+    this._delaySettings.setDefaultDelay(delay);
   }
 
   async $(selector: string): Promise<dom.ElementHandle<Element> | null> {