diff --git a/CHANGELOG.md b/CHANGELOG.md
index 57f3134beb..c1ad2321c1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Fixed pinned statuses not appearing in user profiles
 - Fixed some elements not being keyboard navigation friendly
 - Fixed error handling when updating various profile images
+- Fixed your latest chat messages disappearing when closing chat view and opening it again during the same session
 
 ### Changed
 - Errors when fetching are now shown with popup errors instead of "Error fetching updates" in panel headers
diff --git a/src/services/chat_service/chat_service.js b/src/services/chat_service/chat_service.js
index 1fc4e390fc..e653ebc120 100644
--- a/src/services/chat_service/chat_service.js
+++ b/src/services/chat_service/chat_service.js
@@ -21,7 +21,7 @@ const clear = (storage) => {
       failedMessageIds.push(message.id)
     } else {
       delete storage.idIndex[message.id]
-      delete storage.idempotencyKeyIndex[message.id]
+      delete storage.idempotencyKeyIndex[message.idempotency_key]
     }
   }