diff --git a/components/org.wso2.carbon.identity.sso.saml/src/main/java/org/wso2/carbon/identity/sso/saml/dto/SAMLSSOServiceProviderDTO.java b/components/org.wso2.carbon.identity.sso.saml/src/main/java/org/wso2/carbon/identity/sso/saml/dto/SAMLSSOServiceProviderDTO.java
index 2cec7430..110451ec 100644
--- a/components/org.wso2.carbon.identity.sso.saml/src/main/java/org/wso2/carbon/identity/sso/saml/dto/SAMLSSOServiceProviderDTO.java
+++ b/components/org.wso2.carbon.identity.sso.saml/src/main/java/org/wso2/carbon/identity/sso/saml/dto/SAMLSSOServiceProviderDTO.java
@@ -19,6 +19,7 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonTypeName;
+import org.apache.axis2.databinding.annotation.IgnoreNullElement;
 import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang.StringUtils;
 import org.wso2.carbon.identity.application.common.model.InboundConfigurationProtocol;
@@ -93,6 +94,7 @@ public class SAMLSSOServiceProviderDTO extends InboundConfigurationProtocol impl
     private boolean samlECP;
     private  String idpEntityIDAlias;
 
+    @IgnoreNullElement
     @XmlTransient
     @JsonIgnore
     private Map<String, Object> auditLogData;
diff --git a/pom.xml b/pom.xml
index 6eba4278..b6bb6f11 100644
--- a/pom.xml
+++ b/pom.xml
@@ -478,7 +478,7 @@
         <httpcore.version>4.4.14.wso2v1</httpcore.version>
         <httpcomponents-httpclient.wso2.version>4.5.13.wso2v1</httpcomponents-httpclient.wso2.version>
         <encoder.wso2.version>1.2.0.wso2v1</encoder.wso2.version>
-        <axis2.wso2.version>1.6.1.wso2v12</axis2.wso2.version>
+        <axis2.wso2.version>1.6.1-wso2v40</axis2.wso2.version>
         <joda.wso2.version>2.9.4.wso2v1</joda.wso2.version>
         <com.fasterxml.jackson.version>2.13.2</com.fasterxml.jackson.version>
         <com.google.code.gson.version>2.9.0</com.google.code.gson.version>