diff --git a/js/services/commentThreadService.js b/js/services/commentThreadService.js
index 7a915bc4..bc5e4057 100644
--- a/js/services/commentThreadService.js
+++ b/js/services/commentThreadService.js
@@ -947,6 +947,14 @@ export default class CommentThreadService {
   }
 
   teardown() {
+    try {
+      this.persistCommentCache();
+    } catch (error) {
+      if (this.logger?.warn) {
+        this.logger.warn("[commentThread] Failed to persist comment cache:", error);
+      }
+    }
+
     if (this.subscriptionCleanup) {
       try {
         this.subscriptionCleanup();