diff --git a/ts/components/conversation/Image.tsx b/ts/components/conversation/Image.tsx
index 2fd207747..e3b6e519b 100644
--- a/ts/components/conversation/Image.tsx
+++ b/ts/components/conversation/Image.tsx
@@ -2,6 +2,7 @@ import classNames from 'classnames';
 import React, { useCallback } from 'react';
 import styled from 'styled-components';
 
+import { isNumber } from 'lodash';
 import { useDisableDrag } from '../../hooks/useDisableDrag';
 import { useEncryptedFileFetch } from '../../hooks/useEncryptedFileFetch';
 import { AttachmentType, AttachmentTypeWithPath } from '../../types/Attachment';
@@ -78,8 +79,8 @@ export const Image = (props: Props) => {
   // data will be url if loading is finished and '' if not
   const srcData = !loading ? urlToLoad : '';
 
-  const width = typeof _width === 'number' ? `${_width}px` : _width;
-  const height = typeof _height === 'number' ? `${_height}px` : _height;
+  const width = isNumber(_width) ? `${_width}px` : _width;
+  const height = isNumber(_height) ? `${_height}px` : _height;
 
   return (
     <div
diff --git a/ts/components/conversation/SessionConversation.tsx b/ts/components/conversation/SessionConversation.tsx
index 42981e5e5..004c1fa91 100644
--- a/ts/components/conversation/SessionConversation.tsx
+++ b/ts/components/conversation/SessionConversation.tsx
@@ -459,8 +459,13 @@ export class SessionConversation extends React.Component<Props, State> {
 
         if (isAudio(contentType)) {
           const objectUrl = URL.createObjectURL(file);
-          const duration = await getAudioDuration({ objectUrl, contentType });
-          attachment.duration = duration;
+
+          try {
+            const duration = await getAudioDuration({ objectUrl, contentType });
+            attachment.duration = duration;
+          } finally {
+            URL.revokeObjectURL(objectUrl);
+          }
         }
 
         this.addAttachments([attachment]);