diff --git a/src/main/java/io/nickreuter/retroapi/notification/WebsocketConfig.java b/src/main/java/io/nickreuter/retroapi/notification/WebsocketConfig.java
index adc2bce..3b9d906 100644
--- a/src/main/java/io/nickreuter/retroapi/notification/WebsocketConfig.java
+++ b/src/main/java/io/nickreuter/retroapi/notification/WebsocketConfig.java
@@ -27,6 +27,7 @@
 import org.springframework.security.oauth2.jwt.JwtDecoder;
 import org.springframework.security.oauth2.server.resource.authentication.BearerTokenAuthenticationToken;
 import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationProvider;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
 import org.springframework.util.AntPathMatcher;
 import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker;
 import org.springframework.web.socket.config.annotation.StompEndpointRegistry;
@@ -80,7 +81,11 @@ public void configureMessageBroker(MessageBrokerRegistry registry) {
                     .setClientLogin(relayProperties.relayUsername())
                     .setClientPasscode(relayProperties.relayPassword());
         } else {
-            registry.enableSimpleBroker("/topic");
+            var taskScheduler = new ThreadPoolTaskScheduler();
+            taskScheduler.initialize();
+            registry.enableSimpleBroker("/topic")
+                    .setHeartbeatValue(new long[]{10000, 10000})
+                    .setTaskScheduler(taskScheduler);
         }
     }