diff --git a/background.html b/background.html
index 94d0ec047..95f229b71 100644
--- a/background.html
+++ b/background.html
@@ -267,7 +267,6 @@
       src="libtextsecure/protocol_wrapper.js"
     ></script>
 
-    <script type="text/javascript" src="js/notifications.js"></script>
     <script type="text/javascript" src="js/libphonenumber-util.js"></script>
     <script type="text/javascript" src="js/expiring_messages.js"></script>
     <script
diff --git a/ts/components/conversation/AttachmentList.tsx b/ts/components/conversation/AttachmentList.tsx
index 6c9b6914b..6ed600212 100644
--- a/ts/components/conversation/AttachmentList.tsx
+++ b/ts/components/conversation/AttachmentList.tsx
@@ -71,7 +71,7 @@ export const AttachmentList = ({
               attachments.length > 1 ? onClickAttachment : undefined;
 
             const imageUrl =
-              isVideo && !attachment.screenshot ? BLANK_VIDEO_THUMBNAIL : url;
+              url || (isVideo ? BLANK_VIDEO_THUMBNAIL : undefined);
 
             return (
               <Image