diff --git a/src/components/Viewer.vue b/src/components/Viewer.vue
index 084eec63..28db637c 100644
--- a/src/components/Viewer.vue
+++ b/src/components/Viewer.vue
@@ -87,7 +87,7 @@
             </template>
           </NcActionButton>
           <NcActionButton
-            v-if="currentPhoto.liveid"
+            v-if="currentPhoto?.liveid"
             :aria-label="t('memories', 'Download Video')"
             @click="downloadCurrentLiveVideo"
             :close-after-click="true"
diff --git a/src/components/frame/Photo.vue b/src/components/frame/Photo.vue
index aadbf57b..ef0cb47b 100644
--- a/src/components/frame/Photo.vue
+++ b/src/components/frame/Photo.vue
@@ -397,12 +397,13 @@ div.img-outer {
     }
   }
 
-  > video,
-  > .overlay {
+  > video {
     pointer-events: none;
+    object-fit: cover;
   }
 
   > .overlay {
+    pointer-events: none;
     position: absolute;
     top: 0;
     left: 0;