diff --git a/src/components/common/ProfilePhoto.scss b/src/components/common/ProfilePhoto.scss
index db95e4b1c..d33bb00a4 100644
--- a/src/components/common/ProfilePhoto.scss
+++ b/src/components/common/ProfilePhoto.scss
@@ -7,6 +7,7 @@
   .avatar-media {
     width: 100%;
     object-fit: cover;
+    position: relative;
   }
 
   .spinner-wrapper {
@@ -42,7 +43,6 @@
     position: absolute;
     top: 0;
     left: 0;
-    z-index: -1;
     width: 100%;
     height: 100%;
   }
diff --git a/src/components/mediaViewer/hooks/useMediaProps.ts b/src/components/mediaViewer/hooks/useMediaProps.ts
index 4c83498fe..7a18b1b13 100644
--- a/src/components/mediaViewer/hooks/useMediaProps.ts
+++ b/src/components/mediaViewer/hooks/useMediaProps.ts
@@ -119,8 +119,9 @@ export const useMediaProps = ({
     bestImageData = previewBlobUrl;
   }
   const bestData = localBlobUrl || fullMediaBlobUrl || (
-    !isVideo ? previewBlobUrl || pictogramBlobUrl || bestImageData : undefined
+    (!isVideoAvatar && !isVideo) ? (previewBlobUrl || pictogramBlobUrl || bestImageData) : undefined
   );
+
   const isLocal = Boolean(localBlobUrl);
   const fileName = message
     ? getMessageFileName(message)