diff --git a/src/main/java/com/eactive/eai/custom/adapter/http/dynamic/filter/DouzoneEncFieldInCryptoFilter.java b/src/main/java/com/eactive/eai/custom/adapter/http/dynamic/filter/DouzoneEncFieldInCryptoFilter.java
index 09ffbe7..bbdecc1 100644
--- a/src/main/java/com/eactive/eai/custom/adapter/http/dynamic/filter/DouzoneEncFieldInCryptoFilter.java
+++ b/src/main/java/com/eactive/eai/custom/adapter/http/dynamic/filter/DouzoneEncFieldInCryptoFilter.java
@@ -43,11 +43,10 @@ public class DouzoneEncFieldInCryptoFilter implements HttpAdapterFilter {
 
 	private void setContext(Properties tempProp) {
 		Properties inboundHeaders = (Properties) tempProp.get(HttpAdapterServiceKey.INBOUND_HEADER);
-		String empNm = inboundHeaders.getProperty("x-emp-nm");
-		tempProp.setProperty(InCryptoFilter.PROP_AAD_HEADER, empNm);
-
 		String chnlNm = inboundHeaders.getProperty("x-chnl-nm");
-		tempProp.setProperty(KeyDerivationStrategy.PARAM_CONTEXT_KEY, chnlNm);
+		tempProp.setProperty("x-chnl-nm", chnlNm);
+
+		tempProp.setProperty(InCryptoFilter.PROP_AAD_HEADER, "x-emp-nm");
 	}
 
 	@Override