diff --git a/kamailio/registrar-role.cfg b/kamailio/registrar-role.cfg
index 1c7730e..2c1eb69 100644
--- a/kamailio/registrar-role.cfg
+++ b/kamailio/registrar-role.cfg
@@ -1,4 +1,5 @@
 #!trydef REGISTRAR_NAT_PING_INTERVAL 30
+#!trydef REGISTRAR_NAT_PING_NAT_ONLY 0
 #!trydef REGISTRAR_NAT_PING_WORKERS 5
 #!trydef REGISTRAR_MIN_EXPIRES 300
 #!trydef REGISTRAR_MAX_EXPIRES 3600
@@ -54,7 +55,7 @@ modparam("usrloc", "close_expired_tcp", REGISTRAR_CLOSE_EXPIRED_TCP)
 #!trydef NATHELPER_LOADED
 loadmodule "nathelper.so"
 modparam("nathelper", "natping_interval", REGISTRAR_NAT_PING_INTERVAL)
-modparam("nathelper", "ping_nated_only", 1)
+modparam("nathelper", "ping_nated_only", REGISTRAR_NAT_PING_NAT_ONLY)
 modparam("nathelper", "natping_processes", REGISTRAR_NAT_PING_WORKERS)
 modparam("nathelper", "sipping_bflag", FLB_NATSIPPING)
 #!endif
@@ -98,9 +99,6 @@ route[HANDLE_REGISTER]
         return;
     }
 
-    resetbflag(FLB_NATB);
-    resetbflag(FLB_NATSIPPING);
-
     if (isflagset(FLT_NATS)) {
         setbflag(FLB_NATB);
         fix_nated_register();