diff --git a/synthetics/resource_browser_check_v2.go b/synthetics/resource_browser_check_v2.go
index 3794283..e6cfe28 100644
--- a/synthetics/resource_browser_check_v2.go
+++ b/synthetics/resource_browser_check_v2.go
@@ -248,6 +248,8 @@ func resourceBrowserCheckV2() *schema.Resource {
 												"wait_for_nav_timeout": {
 													Type:     schema.TypeInt,
 													Optional: true,
+													Default: 50,
+													ValidateFunc: validation.IntAtLeast(1),
 												},
 												"max_wait_time": {
 													Type:     schema.TypeInt,
diff --git a/synthetics/resource_browser_check_v2_test.go b/synthetics/resource_browser_check_v2_test.go
index 5863bbe..1b6b0f8 100644
--- a/synthetics/resource_browser_check_v2_test.go
+++ b/synthetics/resource_browser_check_v2_test.go
@@ -94,7 +94,7 @@ resource "synthetics_create_browser_check_v2" "browser_v2_foo_check" {
         selector_type        = "id"
         type                 = "enter_value"
         value                = "{{env.acceptance-variable-terraform-test}}"
-        wait_for_nav_timeout = 50
+        wait_for_nav_timeout = null
       }
       steps {
         name                 = "03 click"
@@ -102,7 +102,7 @@ resource "synthetics_create_browser_check_v2" "browser_v2_foo_check" {
         selector_type        = "id"
         type                 = "click_element"
         wait_for_nav         = true
-        wait_for_nav_timeout = 2000
+        wait_for_nav_timeout = 50
       }
       steps {
         name                 = "04 accept---Alert"
@@ -116,7 +116,7 @@ resource "synthetics_create_browser_check_v2" "browser_v2_foo_check" {
         selector_type        = "id"
         type                 = "select_option"
         wait_for_nav         = false
-        wait_for_nav_timeout = 50
+        wait_for_nav_timeout = 0
       }
     }
     transactions {
@@ -132,7 +132,6 @@ resource "synthetics_create_browser_check_v2" "browser_v2_foo_check" {
         selector_type        = "id"
         type                 = "enter_value"
         value                = "{{env.acceptance-variable-terraform-test}}"
-        wait_for_nav_timeout = 50
       }
       steps {
         name                 = "assert element visible"
@@ -335,6 +334,7 @@ func TestAccCreateUpdateBrowserCheckV2(t *testing.T) {
 					resource.TestCheckResourceAttr("synthetics_create_browser_check_v2.browser_v2_foo_check", "test.0.transactions.0.steps.0.type", "go_to_url"),
 					resource.TestCheckResourceAttr("synthetics_create_browser_check_v2.browser_v2_foo_check", "test.0.transactions.0.steps.0.url", "https://www.splunk.com"),
 					resource.TestCheckResourceAttr("synthetics_create_browser_check_v2.browser_v2_foo_check", "test.0.transactions.0.steps.1.name", "02 fill in fieldz"),
+          resource.TestCheckResourceAttr("synthetics_create_browser_check_v2.browser_v2_foo_check", "test.0.transactions.0.steps.1.wait_for_nav_timeout", "50"),
 					resource.TestCheckResourceAttr("synthetics_create_browser_check_v2.browser_v2_foo_check", "test.0.transactions.0.steps.1.selector", "beep"),
 					resource.TestCheckResourceAttr("synthetics_create_browser_check_v2.browser_v2_foo_check", "test.0.transactions.0.steps.1.selector_type", "id"),
 					resource.TestCheckResourceAttr("synthetics_create_browser_check_v2.browser_v2_foo_check", "test.0.transactions.0.steps.1.type", "enter_value"),
@@ -360,6 +360,7 @@ func TestAccCreateUpdateBrowserCheckV2(t *testing.T) {
 					resource.TestCheckResourceAttr("synthetics_create_browser_check_v2.browser_v2_foo_check", "test.0.transactions.1.steps.0.type", "go_to_url"),
 					resource.TestCheckResourceAttr("synthetics_create_browser_check_v2.browser_v2_foo_check", "test.0.transactions.1.steps.0.url", "https://www.splunk.com"),
 					resource.TestCheckResourceAttr("synthetics_create_browser_check_v2.browser_v2_foo_check", "test.0.transactions.1.steps.1.name", "fill in more fields field"),
+          resource.TestCheckResourceAttr("synthetics_create_browser_check_v2.browser_v2_foo_check", "test.0.transactions.1.steps.1.wait_for_nav_timeout", "50"),
 					resource.TestCheckResourceAttr("synthetics_create_browser_check_v2.browser_v2_foo_check", "test.0.transactions.1.steps.1.selector", "beep"),
 					resource.TestCheckResourceAttr("synthetics_create_browser_check_v2.browser_v2_foo_check", "test.0.transactions.1.steps.1.selector_type", "id"),
 					resource.TestCheckResourceAttr("synthetics_create_browser_check_v2.browser_v2_foo_check", "test.0.transactions.1.steps.1.type", "enter_value"),
diff --git a/synthetics/structures.go b/synthetics/structures.go
index f7ea819..7507ed6 100644
--- a/synthetics/structures.go
+++ b/synthetics/structures.go
@@ -965,6 +965,8 @@ func flattenStepsData(checkSteps *[]sc2.StepsV2) []interface{} {
 
 			if checkStep.WaitForNavTimeout != 0 {
 				cl["wait_for_nav_timeout"] = checkStep.WaitForNavTimeout
+			} else {
+				cl["wait_for_nav_timeout"] = 50
 			}
 
 			if checkStep.MaxWaitTime != 0 {