diff --git a/app.js b/app.js
index d3b90e0d..b935306d 100644
--- a/app.js
+++ b/app.js
@@ -394,6 +394,13 @@ function handleTermSignals () {
           process.exit(0)
         }
       })
+    } else {
+      logger.warn(`Real time server not ready for shutdown, trying again (${currentCleanTry}/${maxCleanTries})...`)
+      currentCleanTry++
+      if (currentCleanTry > maxCleanTries) {
+        logger.error('Could not save note revisions after shutdown! Exiting.')
+        process.exit(1)
+      }
     }
   }, 200)
 }
diff --git a/public/docs/release-notes.md b/public/docs/release-notes.md
index fcdd91f1..82b9b96c 100644
--- a/public/docs/release-notes.md
+++ b/public/docs/release-notes.md
@@ -12,7 +12,8 @@
 
 ### Bugfixes
 - Ignore the healthcheck endpoint in the "too busy" limiter
-- Send the referrer origin for YouTube embeddings due to their requirement 
+- Send the referrer origin for YouTube embeddings due to their requirement
+- Force kill the server after a timeout when waiting for the realtime server to close connections on shutdown
 
 ## <i class="fa fa-tag"></i> 1.10.3 <i class="fa fa-calendar-o"></i> 2025-04-09