diff --git a/src/main/java/com/knecon/fforesight/mongo/database/commons/MongoTenantMessagingConfiguration.java b/src/main/java/com/knecon/fforesight/mongo/database/commons/MongoTenantMessagingConfiguration.java
index 9f213f4..612fd47 100644
--- a/src/main/java/com/knecon/fforesight/mongo/database/commons/MongoTenantMessagingConfiguration.java
+++ b/src/main/java/com/knecon/fforesight/mongo/database/commons/MongoTenantMessagingConfiguration.java
@@ -28,7 +28,7 @@ public class MongoTenantMessagingConfiguration {
 
 
     @Bean(name = "mongoTenantExchange")
-    TopicExchange mongoTenantExchange(@Value("${fforesight.tenant-exchange.name}") String tenantExchangeName) {
+    TopicExchange mongoTenantExchange(@Value("${fforesight.tenant-exchange.name:tenants-exchange}") String tenantExchangeName) {
 
         return new TopicExchange(tenantExchangeName);
     }