diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlRetriever.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlRetriever.kt
index b4fbeaf325..174841b599 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlRetriever.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlRetriever.kt
@@ -116,7 +116,7 @@ class PreviewUrlRetriever @Inject constructor(
 
     // Called by the Epoxy item during unbinding
     fun removeListener(key: String, listener: PreviewUrlRetrieverListener) {
-        listeners.getOrPut(key) { mutableSetOf() }.remove(listener)
+        listeners[key]?.remove(listener)
     }
 
     interface PreviewUrlRetrieverListener {