diff --git a/feature/policy_forwarding/otg_tests/mpls_gre_udp_decap_test/mpls_gre_udp_decap_test.go b/feature/policy_forwarding/otg_tests/mpls_gre_udp_decap_test/mpls_gre_udp_decap_test.go
index ac781f46321..383ad372ee9 100644
--- a/feature/policy_forwarding/otg_tests/mpls_gre_udp_decap_test/mpls_gre_udp_decap_test.go
+++ b/feature/policy_forwarding/otg_tests/mpls_gre_udp_decap_test/mpls_gre_udp_decap_test.go
@@ -317,6 +317,9 @@ func configureDUT(t *testing.T, dut *ondatra.DUTDevice) {
 }
 
 func configureInputPolicy(t *testing.T, dut *ondatra.DUTDevice, tc testCase) {
+	if deviations.InterfacePolicyForwardingOCUnsupported(dut) {
+		return
+	}
 	defaultNIName := deviations.DefaultNetworkInstance(dut)
 	interfaceName := dut.Port(t, port1).Name()
 	var policyName string
@@ -333,6 +336,7 @@ func configureInputPolicy(t *testing.T, dut *ondatra.DUTDevice, tc testCase) {
 		AppliedPolicyName: policyName,
 	}
 	cfgplugins.InterfacePolicyForwardingConfig(t, dut, nil, "", pf, ocPFParams)
+	gnmi.Replace(t, dut, gnmi.OC().NetworkInstance(defaultNIName).PolicyForwarding().Interface(interfaceName).Config(), pf.GetInterface(interfaceName))
 }
 
 func configureDecapPolicyForwarding(t *testing.T, dut *ondatra.DUTDevice, interfaceName string) {
diff --git a/internal/cfgplugins/policyforwarding.go b/internal/cfgplugins/policyforwarding.go
index 2a96fd46a65..c956b0ca7b3 100644
--- a/internal/cfgplugins/policyforwarding.go
+++ b/internal/cfgplugins/policyforwarding.go
@@ -451,7 +451,6 @@ func InterfacePolicyForwardingConfig(t *testing.T, dut *ondatra.DUTDevice, a *at
 		}
 	} else {
 		ApplyPolicyToInterfaceOC(t, pf, params.InterfaceID, params.AppliedPolicyName)
-
 	}
 }