diff --git a/setup/base/base.go b/setup/base/base.go
index e67b034a3..7091c6ba5 100644
--- a/setup/base/base.go
+++ b/setup/base/base.go
@@ -469,14 +469,12 @@ func (b *BaseDendrite) SetupAndServeHTTP(
 	}
 
 	minwinsvc.SetOnExit(b.ProcessContext.ShutdownDendrite)
-
 	<-b.ProcessContext.WaitForShutdown()
+
 	logrus.Infof("Stopping HTTP listeners")
 	_ = internalServ.Shutdown(context.Background())
 	_ = externalServ.Shutdown(context.Background())
 	logrus.Infof("Stopped HTTP listeners")
-
-	b.WaitForShutdown()
 }
 
 func (b *BaseDendrite) WaitForShutdown() {