diff --git a/src/lib.rs b/src/lib.rs
index 633fd5313..12a0f4a7d 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -218,17 +218,15 @@ pub async fn start_lemmy_server(args: CmdArgs) -> LemmyResult<()> {
   let mut interrupt = tokio::signal::unix::signal(SignalKind::interrupt())?;
   let mut terminate = tokio::signal::unix::signal(SignalKind::terminate())?;
 
-  if server.is_some() || federate.is_some() {
-    tokio::select! {
-      _ = tokio::signal::ctrl_c() => {
-        tracing::warn!("Received ctrl-c, shutting down gracefully...");
-      }
-      _ = interrupt.recv() => {
-        tracing::warn!("Received interrupt, shutting down gracefully...");
-      }
-      _ = terminate.recv() => {
-        tracing::warn!("Received terminate, shutting down gracefully...");
-      }
+  tokio::select! {
+    _ = tokio::signal::ctrl_c() => {
+      tracing::warn!("Received ctrl-c, shutting down gracefully...");
+    }
+    _ = interrupt.recv() => {
+      tracing::warn!("Received interrupt, shutting down gracefully...");
+    }
+    _ = terminate.recv() => {
+      tracing::warn!("Received terminate, shutting down gracefully...");
     }
   }
   if let Some(server) = server {