1 files changed, 7 insertions, 11 deletions
diff --git a/src/main/java/org/traccar/MainModule.java b/src/main/java/org/traccar/MainModule.java
index 29d846154..950a7278a 100644
--- a/src/main/java/org/traccar/MainModule.java
+++ b/src/main/java/org/traccar/MainModule.java
@@ -341,18 +341,14 @@ public class MainModule extends AbstractModule {
     @Provides
     public static BroadcastService provideBroadcastService(
             Config config, ObjectMapper objectMapper) throws IOException {
-        String broadcastType = config.getString(Keys.BROADCAST_TYPE);
-        if (config.hasKey(Keys.BROADCAST_ADDRESS)) {
-            switch (broadcastType) {
-                case "multicast":
-                    return new MulticastBroadcastService(config, objectMapper);
-                case "redis":
-                    return new RedisBroadcastService(config, objectMapper);
-                default:
-                    break;
-            }
+        switch (config.getString(Keys.BROADCAST_TYPE)) {
+            case "multicast":
+                return new MulticastBroadcastService(config, objectMapper);
+            case "redis":
+                return new RedisBroadcastService(config, objectMapper);
+            default:
+                return new NullBroadcastService();
         }
-        return new NullBroadcastService();
     }
 
     @Singleton