diff --git a/src/Vervis/Application.hs b/src/Vervis/Application.hs
index 7b8c440..fe792d5 100644
--- a/src/Vervis/Application.hs
+++ b/src/Vervis/Application.hs
@@ -286,7 +286,8 @@ appMain = do
     forkCheck $ actorKeyPeriodicRotator foundation
 
     -- Run periodic activity delivery retry runner
-    forkCheck $ deliveryRunner foundation
+    when (appFederation $ appSettings foundation) $
+        forkCheck $ deliveryRunner foundation
 
     -- Run SSH server
     forkCheck $ sshServer foundation