diff --git a/src/BuildingBlocks/EventBus/EventBusRabbitMQ/MultiEventBusRabbitMQ.cs b/src/BuildingBlocks/EventBus/EventBusRabbitMQ/MultiEventBusRabbitMQ.cs
index f386f9b41..f2c9fd0c5 100644
--- a/src/BuildingBlocks/EventBus/EventBusRabbitMQ/MultiEventBusRabbitMQ.cs
+++ b/src/BuildingBlocks/EventBus/EventBusRabbitMQ/MultiEventBusRabbitMQ.cs
@@ -30,12 +30,15 @@ namespace Microsoft.eShopOnContainers.BuildingBlocks.EventBusRabbitMQ
                     eventBus.Publish(@event);
                 });
             }
-            
-            //TODO requires ALL events to have tenantId set!
-            _tenants.TryGetValue(@event.TenantId, out String tenantName);
-            var actualEventBus = _eventBuses.Find(e => e.GetVHost().Equals(tenantName));
+            else
+            {
+                //TODO requires ALL events to have tenantId set!
+                _tenants.TryGetValue(@event.TenantId, out String tenantName);
+                var actualEventBus = _eventBuses.Find(e => e.GetVHost().Equals(tenantName));
+
+                actualEventBus.Publish(@event);
+            }
 
-            actualEventBus.Publish(@event);
         }
 
         public void Subscribe<T, TH>() where T : IntegrationEvent where TH : IIntegrationEventHandler<T>