diff --git a/scenarios_lnp/incoming_peer/0001_test.yml.tt2 b/scenarios_lnp/incoming_peer/0001_test.yml.tt2
index 41d664f9..959b3c73 100644
--- a/scenarios_lnp/incoming_peer/0001_test.yml.tt2
+++ b/scenarios_lnp/incoming_peer/0001_test.yml.tt2
@@ -38,6 +38,8 @@ flow:
   - start|ROUTE_CALLER_BLOCK_CLI:
   - return|ROUTE_CALLER_BLOCK_CLI:
   - start|ROUTE_FIND_CALLEE:
+  - start|ROUTE_DETECT_LOOP:
+  - return|ROUTE_DETECT_LOOP:
   - start|ROUTE_CLEAR_CALLEE_PREF:
   - return|ROUTE_CLEAR_CALLEE_PREF:
   - start|ROUTE_LOAD_CALLEE_PREF:
diff --git a/scenarios_lnp/incoming_peer/0003_test.yml.tt2 b/scenarios_lnp/incoming_peer/0003_test.yml.tt2
index 56c9bf86..2b15fcee 100644
--- a/scenarios_lnp/incoming_peer/0003_test.yml.tt2
+++ b/scenarios_lnp/incoming_peer/0003_test.yml.tt2
@@ -45,6 +45,8 @@ flow:
   - return|ROUTE_CHECK_CLI_ALLOWED:
   - return|ROUTE_CHECK_USERPROV_CLI:
   - start|ROUTE_FIND_CALLEE:
+  - start|ROUTE_DETECT_LOOP:
+  - return|ROUTE_DETECT_LOOP:
   - start|ROUTE_CLEAR_CALLEE_PREF:
   - return|ROUTE_CLEAR_CALLEE_PREF:
   - start|ROUTE_LNP:
diff --git a/scenarios_lnp/incoming_peer_unallocated_authoritative/0001_test.yml.tt2 b/scenarios_lnp/incoming_peer_unallocated_authoritative/0001_test.yml.tt2
index e69f1a74..8e7a4055 100644
--- a/scenarios_lnp/incoming_peer_unallocated_authoritative/0001_test.yml.tt2
+++ b/scenarios_lnp/incoming_peer_unallocated_authoritative/0001_test.yml.tt2
@@ -38,6 +38,8 @@ flow:
   - start|ROUTE_CALLER_BLOCK_CLI:
   - return|ROUTE_CALLER_BLOCK_CLI:
   - start|ROUTE_FIND_CALLEE:
+  - start|ROUTE_DETECT_LOOP:
+  - return|ROUTE_DETECT_LOOP:
   - start|ROUTE_CLEAR_CALLEE_PREF:
   - return|ROUTE_CLEAR_CALLEE_PREF:
   - start|ROUTE_LNP:
diff --git a/scenarios_lnp/invite/0003_test.yml.tt2 b/scenarios_lnp/invite/0003_test.yml.tt2
index 4ba8bcc2..ebfd9ced 100644
--- a/scenarios_lnp/invite/0003_test.yml.tt2
+++ b/scenarios_lnp/invite/0003_test.yml.tt2
@@ -49,6 +49,8 @@ flow:
   - return|ROUTE_CHECK_CLI_ALLOWED:
   - return|ROUTE_CHECK_USERPROV_CLI:
   - start|ROUTE_FIND_CALLEE:
+  - start|ROUTE_DETECT_LOOP:
+  - return|ROUTE_DETECT_LOOP:
   - start|ROUTE_CLEAR_CALLEE_PREF:
   - return|ROUTE_CLEAR_CALLEE_PREF:
   - start|ROUTE_LOAD_CALLEE_PREF:
diff --git a/scenarios_lnp/invite_ncos_black/0003_test.yml.tt2 b/scenarios_lnp/invite_ncos_black/0003_test.yml.tt2
index 407b320f..cd93f138 100644
--- a/scenarios_lnp/invite_ncos_black/0003_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_black/0003_test.yml.tt2
@@ -54,6 +54,8 @@ flow:
   - return|ROUTE_CHECK_CLI_ALLOWED:
   - return|ROUTE_CHECK_USERPROV_CLI:
   - start|ROUTE_FIND_CALLEE:
+  - start|ROUTE_DETECT_LOOP:
+  - return|ROUTE_DETECT_LOOP:
   - start|ROUTE_CLEAR_CALLEE_PREF:
   - return|ROUTE_CLEAR_CALLEE_PREF:
   - start|ROUTE_LNP:
diff --git a/scenarios_lnp/invite_ncos_black/0007_test.yml.tt2 b/scenarios_lnp/invite_ncos_black/0007_test.yml.tt2
index bfa3f859..e3aff64c 100644
--- a/scenarios_lnp/invite_ncos_black/0007_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_black/0007_test.yml.tt2
@@ -49,6 +49,8 @@ flow:
   - return|ROUTE_CHECK_CLI_ALLOWED:
   - return|ROUTE_CHECK_USERPROV_CLI:
   - start|ROUTE_FIND_CALLEE:
+  - start|ROUTE_DETECT_LOOP:
+  - return|ROUTE_DETECT_LOOP:
   - start|ROUTE_CLEAR_CALLEE_PREF:
   - return|ROUTE_CLEAR_CALLEE_PREF:
   - start|ROUTE_LNP:
diff --git a/scenarios_lnp/invite_ncos_black/0011_test.yml.tt2 b/scenarios_lnp/invite_ncos_black/0011_test.yml.tt2
index bd11a160..d36e07a9 100644
--- a/scenarios_lnp/invite_ncos_black/0011_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_black/0011_test.yml.tt2
@@ -49,6 +49,8 @@ flow:
   - return|ROUTE_CHECK_CLI_ALLOWED:
   - return|ROUTE_CHECK_USERPROV_CLI:
   - start|ROUTE_FIND_CALLEE:
+  - start|ROUTE_DETECT_LOOP:
+  - return|ROUTE_DETECT_LOOP:
   - start|ROUTE_CLEAR_CALLEE_PREF:
   - return|ROUTE_CLEAR_CALLEE_PREF:
   - start|ROUTE_LNP:
diff --git a/scenarios_lnp/invite_ncos_white/0003_test.yml.tt2 b/scenarios_lnp/invite_ncos_white/0003_test.yml.tt2
index 09532580..3b1a22d0 100644
--- a/scenarios_lnp/invite_ncos_white/0003_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_white/0003_test.yml.tt2
@@ -49,6 +49,8 @@ flow:
   - return|ROUTE_CHECK_CLI_ALLOWED:
   - return|ROUTE_CHECK_USERPROV_CLI:
   - start|ROUTE_FIND_CALLEE:
+  - start|ROUTE_DETECT_LOOP:
+  - return|ROUTE_DETECT_LOOP:
   - start|ROUTE_CLEAR_CALLEE_PREF:
   - return|ROUTE_CLEAR_CALLEE_PREF:
   - start|ROUTE_LNP:
diff --git a/scenarios_lnp/invite_ncos_white/0019_test.yml.tt2 b/scenarios_lnp/invite_ncos_white/0019_test.yml.tt2
index 87c1bee8..7593a1a4 100644
--- a/scenarios_lnp/invite_ncos_white/0019_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_white/0019_test.yml.tt2
@@ -49,6 +49,8 @@ flow:
   - return|ROUTE_CHECK_CLI_ALLOWED:
   - return|ROUTE_CHECK_USERPROV_CLI:
   - start|ROUTE_FIND_CALLEE:
+  - start|ROUTE_DETECT_LOOP:
+  - return|ROUTE_DETECT_LOOP:
   - start|ROUTE_CLEAR_CALLEE_PREF:
   - return|ROUTE_CLEAR_CALLEE_PREF:
   - start|ROUTE_LNP:
diff --git a/scenarios_lnp/invite_ncos_white/0035_test.yml.tt2 b/scenarios_lnp/invite_ncos_white/0035_test.yml.tt2
index af49bc09..1b6347ad 100644
--- a/scenarios_lnp/invite_ncos_white/0035_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_white/0035_test.yml.tt2
@@ -54,6 +54,8 @@ flow:
   - return|ROUTE_CHECK_CLI_ALLOWED:
   - return|ROUTE_CHECK_USERPROV_CLI:
   - start|ROUTE_FIND_CALLEE:
+  - start|ROUTE_DETECT_LOOP:
+  - return|ROUTE_DETECT_LOOP:
   - start|ROUTE_CLEAR_CALLEE_PREF:
   - return|ROUTE_CLEAR_CALLEE_PREF:
   - start|ROUTE_LNP:
diff --git a/scenarios_lnp/invite_peerout/0003_test.yml.tt2 b/scenarios_lnp/invite_peerout/0003_test.yml.tt2
index 1fe732bf..24995bbe 100644
--- a/scenarios_lnp/invite_peerout/0003_test.yml.tt2
+++ b/scenarios_lnp/invite_peerout/0003_test.yml.tt2
@@ -55,6 +55,8 @@ flow:
   - start|ROUTE_FIND_CALLEE:
   - start|ROUTE_APPLY_REWRITE_RULE:
   - return|ROUTE_APPLY_REWRITE_RULE:
+  - start|ROUTE_DETECT_LOOP:
+  - return|ROUTE_DETECT_LOOP:
   - start|ROUTE_CLEAR_CALLEE_PREF:
   - return|ROUTE_CLEAR_CALLEE_PREF:
       $xavp(callee_real_prefs[0]=>lnp_for_local_sub): None
diff --git a/scenarios_lnp/invite_peerout_rn/0003_test.yml.tt2 b/scenarios_lnp/invite_peerout_rn/0003_test.yml.tt2
index 33965e34..e197fba4 100644
--- a/scenarios_lnp/invite_peerout_rn/0003_test.yml.tt2
+++ b/scenarios_lnp/invite_peerout_rn/0003_test.yml.tt2
@@ -49,6 +49,8 @@ flow:
   - return|ROUTE_CHECK_CLI_ALLOWED:
   - return|ROUTE_CHECK_USERPROV_CLI:
   - start|ROUTE_FIND_CALLEE:
+  - start|ROUTE_DETECT_LOOP:
+  - return|ROUTE_DETECT_LOOP:
   - start|ROUTE_CLEAR_CALLEE_PREF:
   - return|ROUTE_CLEAR_CALLEE_PREF:
       $xavp(callee_real_prefs[0]=>lnp_for_local_sub): None