diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/UserProfilePicture.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/UserProfilePicture.kt
index 8d2167580..c3ddbc8e3 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/UserProfilePicture.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/UserProfilePicture.kt
@@ -152,7 +152,7 @@ fun ClickableUserPicture(
 ) {
     // BaseUser is the same reference as accountState.user
     val myModifier =
-        remember {
+        remember(baseUser) {
             if (onClick != null && onLongClick != null) {
                 Modifier
                     .size(size)