diff --git a/nsxt/resource_nsxt_policy_bgp_neighbor.go b/nsxt/resource_nsxt_policy_bgp_neighbor.go
index ecf26b689..d22cb5d95 100644
--- a/nsxt/resource_nsxt_policy_bgp_neighbor.go
+++ b/nsxt/resource_nsxt_policy_bgp_neighbor.go
@@ -290,13 +290,16 @@ func resourceNsxtPolicyBgpNeighborResourceDataToStruct(d *schema.ResourceData, i
 		KeepAliveTime:       &keepAliveTime,
 		MaximumHopLimit:     &maximumHopLimit,
 		NeighborAddress:     &neighborAddress,
-		Password:            &password,
 		RemoteAsNum:         &remoteAsNum,
 		RouteFiltering:      rFilters,
 		SourceAddresses:     sourceAddresses,
 		Id:                  &id,
 	}
 
+	if d.HasChange("password") {
+		neighborStruct.Password = &password
+	}
+
 	return neighborStruct, nil
 }