diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/event/external/service/message/MessageFactory.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/event/external/service/message/MessageFactory.java
index 2691d54fb..f1d492f29 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/event/external/service/message/MessageFactory.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/event/external/service/message/MessageFactory.java
@@ -89,7 +89,7 @@ public class MessageFactory implements InitializingBean {
     }
 
     private String getTenantId() {
-        return ThreadLocalContextUtil.getTenant().getName();
+        return ThreadLocalContextUtil.getTenant().getTenantIdentifier();
     }
 
     private String getMessageCreatedAt() {