diff --git a/src/Paralax.MessageBrokers.RabbitMQ/src/Paralax.MessageBrokers.RabbitMQ/Extensions.cs b/src/Paralax.MessageBrokers.RabbitMQ/src/Paralax.MessageBrokers.RabbitMQ/Extensions.cs
index 7592a8b..fddb381 100644
--- a/src/Paralax.MessageBrokers.RabbitMQ/src/Paralax.MessageBrokers.RabbitMQ/Extensions.cs
+++ b/src/Paralax.MessageBrokers.RabbitMQ/src/Paralax.MessageBrokers.RabbitMQ/Extensions.cs
@@ -75,6 +75,13 @@ public static IParalaxBuilder AddRabbitMq(this IParalaxBuilder builder, string s
                 builder.Services.AddSingleton<IConventionsRegistry, ConventionsRegistry>();
                 builder.Services.AddSingleton<MessageSubscribersChannel>();
 
+                builder.Services.AddSingleton<IBusPublisher, RabbitMqPublisher>();
+                builder.Services.AddSingleton<IBusSubscriber, RabbitMqSubscriber>();
+                builder.Services.AddSingleton<MessageSubscribersChannel>();
+                builder.Services.AddTransient<RabbitMqExchangeInitializer>();
+                builder.Services.AddHostedService<RabbitMqBackgroundService>();
+                builder.AddInitializer<RabbitMqExchangeInitializer>();
+
 
                 builder.Services.AddSingleton<IRabbitMqPropertiesFactory, RabbitMqPropertiesFactory>();
                 builder.Services.AddSingleton<IRabbitMqChannelFactory, RabbitMqChannelFactory>();
@@ -108,12 +115,7 @@ public static IParalaxBuilder AddRabbitMq(this IParalaxBuilder builder, string s
             }
 
             // Register other services that need to be shared
-            builder.Services.AddSingleton<IBusPublisher, RabbitMqPublisher>();
-            builder.Services.AddSingleton<IBusSubscriber, RabbitMqSubscriber>();
-            builder.Services.AddSingleton<MessageSubscribersChannel>();
-            builder.Services.AddTransient<RabbitMqExchangeInitializer>();
-            builder.Services.AddHostedService<RabbitMqBackgroundService>();
-            builder.AddInitializer<RabbitMqExchangeInitializer>();
+            
 
             return builder;
         }
@@ -202,9 +204,13 @@ public static IBusSubscriber UseRabbitMq(this IApplicationBuilder app)
         {
             var messageSubscribersChannel = app.ApplicationServices.GetRequiredService<MessageSubscribersChannel>();
 
-            // Get all RabbitMQ clients and inject them into RabbitMqSubscriber
             var clients = app.ApplicationServices.GetServices<IRabbitMqClient>();
 
+            if (!clients.Any())
+            {
+                throw new InvalidOperationException("No RabbitMQ clients have been registered.");
+            }
+
             return new RabbitMqSubscriber(clients, messageSubscribersChannel);
         }
     }