diff --git a/components/application-mgt/org.wso2.carbon.identity.application.mgt.ui/src/main/resources/web/application/configure-service-provider.jsp b/components/application-mgt/org.wso2.carbon.identity.application.mgt.ui/src/main/resources/web/application/configure-service-provider.jsp
index a1a47ef57373..c98d0c34a7f2 100644
--- a/components/application-mgt/org.wso2.carbon.identity.application.mgt.ui/src/main/resources/web/application/configure-service-provider.jsp
+++ b/components/application-mgt/org.wso2.carbon.identity.application.mgt.ui/src/main/resources/web/application/configure-service-provider.jsp
@@ -1211,8 +1211,8 @@
     function deleteClaimRow(obj) {
         if ($('input:radio[name=claim_dialect]:checked').val() == "custom") {
             if ($(obj).parent().parent().find('input.spClaimVal').val().length > 0) {
-                $('#roleClaim option[value="' + $(obj).parent().parent().find('input.spClaimVal').val() + '"]').remove();
-                $('#subject_claim_uri option[value="' + $(obj).parent().parent().find('input.spClaimVal').val() + '"]').remove();
+               $('#roleClaim option[value="' + encodeForHTML($(obj).parent().parent().find('input.spClaimVal').val()) + '"]').remove();
+                $('#subject_claim_uri option[value="' + encodeForHTML($(obj).parent().parent().find('input.spClaimVal').val()) + '"]').remove();
             }
         }