diff --git a/dockers/docker-fpm-frr/TSA b/dockers/docker-fpm-frr/TSA
index 441765694a..dc96d32c45 100755
--- a/dockers/docker-fpm-frr/TSA
+++ b/dockers/docker-fpm-frr/TSA
@@ -24,12 +24,17 @@ then
     case "$route_map_name" in
       *V4*)
         ip_version=V4
+        ip_protocol=ip
       ;;
       *V6*)
         ip_version=V6
+        ip_protocol=ipv6
+      ;;
+      *)
+        continue
       ;;
     esac
-    sonic-cfggen -d -a "{\"route_map_name\":\"$route_map_name\", \"ip_version\": \"$ip_version\"}" -y /etc/sonic/constants.yml -t /usr/share/sonic/templates/bgpd/tsa/bgpd.tsa.isolate.conf.j2 > "$TSA_FILE"
+    sonic-cfggen -d -a "{\"route_map_name\":\"$route_map_name\", \"ip_version\": \"$ip_version\", \"ip_protocol\": \"$ip_protocol\"}" -y /etc/sonic/constants.yml -t /usr/share/sonic/templates/bgpd/tsa/bgpd.tsa.isolate.conf.j2 > "$TSA_FILE"
     vtysh -f "$TSA_FILE"
     rm -f "$TSA_FILE"
   done
diff --git a/dockers/docker-fpm-frr/TSB b/dockers/docker-fpm-frr/TSB
index 84a3c183e6..68eee9c2fa 100755
--- a/dockers/docker-fpm-frr/TSB
+++ b/dockers/docker-fpm-frr/TSB
@@ -24,6 +24,15 @@ then
   TSB_FILE=$(mktemp)
   for route_map_name in $(echo "$config" | sed -ne 's/  neighbor \S* route-map \(\S*\) out/\1/p');
   do
+    case "$route_map_name" in
+      *V4*)
+      ;;
+      *V6*)
+      ;;
+      *)
+        continue
+      ;;
+    esac
     sonic-cfggen -d -a "{\"route_map_name\":\"$route_map_name\"}" -t /usr/share/sonic/templates/bgpd/tsa/bgpd.tsa.unisolate.conf.j2 > "$TSB_FILE"
     vtysh -f "$TSB_FILE"
     rm -f "$TSB_FILE"
diff --git a/dockers/docker-fpm-frr/frr/bgpd/tsa/bgpd.tsa.isolate.conf.j2 b/dockers/docker-fpm-frr/frr/bgpd/tsa/bgpd.tsa.isolate.conf.j2
index 88b1c5acb2..94287bdcd3 100644
--- a/dockers/docker-fpm-frr/frr/bgpd/tsa/bgpd.tsa.isolate.conf.j2
+++ b/dockers/docker-fpm-frr/frr/bgpd/tsa/bgpd.tsa.isolate.conf.j2
@@ -1,5 +1,5 @@
 route-map {{ route_map_name }} permit 2
-  match ip address prefix-list PL_Loopback{{ ip_version }}
+  match {{ ip_protocol }} address prefix-list PL_Loopback{{ ip_version }}
   set community {{ constants.bgp.traffic_shift_community }}
 route-map {{ route_map_name }} deny 3
 !
diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/tsa/isolate.json b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/tsa/isolate.json
index 708e4013f1..807dfe7e1a 100644
--- a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/tsa/isolate.json
+++ b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/tsa/isolate.json
@@ -5,5 +5,6 @@
         }
     },
     "route_map_name": "test_rm_name",
-    "ip_version": "V4"
+    "ip_version": "V4",
+    "ip_protocol": "ip"
 }
\ No newline at end of file