diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/UrlPreviewCard.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/UrlPreviewCard.kt
index 561d86ab3..88de0195b 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/UrlPreviewCard.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/UrlPreviewCard.kt
@@ -10,6 +10,7 @@ import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
@@ -41,13 +42,15 @@ fun UrlPreviewCard(
             )
     ) {
         Column {
-            val validatedUrl = URL(previewInfo.url)
+            val validatedUrl = remember { URL(previewInfo.url) }
 
             // correctly treating relative images
-            val imageUrl = if (previewInfo.image.startsWith("/")) {
-                URL(validatedUrl, previewInfo.image).toString()
-            } else {
-                previewInfo.image
+            val imageUrl = remember {
+                if (previewInfo.image.startsWith("/")) {
+                    URL(validatedUrl, previewInfo.image).toString()
+                } else {
+                    previewInfo.image
+                }
             }
 
             AsyncImage(
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/VideoView.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/VideoView.kt
index af8444a1f..40d1b72c7 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/VideoView.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/VideoView.kt
@@ -116,9 +116,9 @@ fun VideoView(videoUri: Uri, description: String? = null, onDialog: ((Boolean) -
                     .defaultMinSize(minHeight = 70.dp)
                     .align(Alignment.Center)
                     .onVisibilityChanges { visible ->
-                        if (visible) {
+                        if (visible && !exoPlayer.isPlaying) {
                             exoPlayer.play()
-                        } else {
+                        } else if (!visible && exoPlayer.isPlaying) {
                             exoPlayer.pause()
                         }
                     },
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/ZoomableContentView.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/ZoomableContentView.kt
index 6eed48772..d54b41ecc 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/ZoomableContentView.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/ZoomableContentView.kt
@@ -280,12 +280,16 @@ private fun UrlImageView(
     }
 
     BoxWithConstraints(contentAlignment = Alignment.Center) {
-        val myModifier = mainImageModifier.run {
-            aspectRatio(content.dim)?.let { ratio ->
-                this.aspectRatio(ratio, maxHeight.isFinite)
-            } ?: this
+        val myModifier = remember {
+            mainImageModifier.run {
+                aspectRatio(content.dim)?.let { ratio ->
+                    this.aspectRatio(ratio, maxHeight.isFinite)
+                } ?: this
+            }
+        }
+        val contentScale = remember {
+            if (maxHeight.isFinite) ContentScale.Inside else ContentScale.FillWidth
         }
-        val contentScale = if (maxHeight.isFinite) ContentScale.Inside else ContentScale.FillWidth
 
         AsyncImage(
             model = content.url,