diff --git a/web/media/encrypted-multimedia.react.js b/web/media/encrypted-multimedia.react.js
--- a/web/media/encrypted-multimedia.react.js
+++ b/web/media/encrypted-multimedia.react.js
@@ -86,12 +86,14 @@
 
   if (!source && !invisibleLoad) {
     loadingIndicator = props.loadingIndicatorComponent ?? (
-      <LoadingIndicator
-        status="loading"
-        size="large"
-        color="white"
-        loadingClassName={css.loadingIndicator}
-      />
+      <div className={css.loadingIndicatorContainer}>
+        <LoadingIndicator
+          status="loading"
+          size="large"
+          color="white"
+          loadingClassName={css.loadingIndicator}
+        />
+      </div>
     );
   }
 
diff --git a/web/media/media.css b/web/media/media.css
--- a/web/media/media.css
+++ b/web/media/media.css
@@ -62,17 +62,6 @@
   height: 50px;
 }
 
-span.multimedia .loadingIndicator {
-  position: absolute;
-  top: 0;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  margin: auto auto;
-  width: 25px;
-  height: 25px;
-}
-
 :global(.CircularProgressbar-background) {
   fill: #666 !important;
 }
@@ -85,3 +74,7 @@
 :global(.CircularProgressbar-trail) {
   stroke: transparent !important;
 }
+
+.loadingIndicatorContainer {
+  position: absolute;
+}
diff --git a/web/media/multimedia-modal.react.js b/web/media/multimedia-modal.react.js
--- a/web/media/multimedia-modal.react.js
+++ b/web/media/multimedia-modal.react.js
@@ -130,13 +130,13 @@
   const multimediaModal = React.useMemo(
     () => (
       <FullScreenViewModal
-        dynamicContentDimensions={dimensions}
+        initialContentDimensions={media.dimensions}
         setDynamicContentDimensions={setDimensions}
       >
         {mediaModalItem}
       </FullScreenViewModal>
     ),
-    [dimensions, mediaModalItem],
+    [media.dimensions, mediaModalItem],
   );
 
   return multimediaModal;
diff --git a/web/modals/full-screen-view-modal.react.js b/web/modals/full-screen-view-modal.react.js
--- a/web/modals/full-screen-view-modal.react.js
+++ b/web/modals/full-screen-view-modal.react.js
@@ -12,7 +12,7 @@
 
 type BaseProps = {
   +children: React.Node,
-  +dynamicContentDimensions?: ?Dimensions,
+  +initialContentDimensions?: ?Dimensions,
   +setDynamicContentDimensions?: SetState<?Dimensions>,
 };
 
@@ -79,12 +79,12 @@
     };
 
   calculateDynamicContentDimensions: () => mixed = () => {
-    const { dynamicContentDimensions, setDynamicContentDimensions } =
+    const { initialContentDimensions, setDynamicContentDimensions } =
       this.props;
 
     if (
       !this.overlay ||
-      !dynamicContentDimensions ||
+      !initialContentDimensions ||
       !setDynamicContentDimensions
     ) {
       return;
@@ -95,7 +95,7 @@
     const containerAspectRatio = containerWidth / containerHeight;
 
     const { width: contentWidth, height: contentHeight } =
-      dynamicContentDimensions;
+      initialContentDimensions;
     const contentAspectRatio = contentWidth / contentHeight;
 
     let newWidth, newHeight;