diff --git a/ts/components/conversation/media-gallery/DocumentListItem.tsx b/ts/components/conversation/media-gallery/DocumentListItem.tsx
index 15332ed24d5..639fd4b341d 100644
--- a/ts/components/conversation/media-gallery/DocumentListItem.tsx
+++ b/ts/components/conversation/media-gallery/DocumentListItem.tsx
@@ -6,8 +6,6 @@ import React from 'react';
 import moment from 'moment';
 import formatFileSize from 'filesize';
 
-// import { LoadingIndicator } from './LoadingIndicator';
-
 interface Props {
   fileName?: string;
   fileSize?: number;
@@ -57,10 +55,6 @@ export class DocumentListItem extends React.Component<Props, {}> {
   public renderContent() {
     const { fileName, fileSize, timestamp } = this.props;
 
-    // if (!attachment.data) {
-    //   return <LoadingIndicator />;
-    // }
-
     return (
       <div style={styles.itemContainer} onClick={this.props.onClick}>
         <img
diff --git a/ts/components/conversation/media-gallery/MediaGallery.tsx b/ts/components/conversation/media-gallery/MediaGallery.tsx
index 58dcd57b82a..6fcf9c2a23b 100644
--- a/ts/components/conversation/media-gallery/MediaGallery.tsx
+++ b/ts/components/conversation/media-gallery/MediaGallery.tsx
@@ -121,7 +121,6 @@ export class MediaGallery extends React.Component<Props, State> {
     const type = selectedTab;
 
     if (!messages || messages.length === 0) {
-      // return <LoadingIndicator />;
       return null;
     }
 
diff --git a/ts/components/conversation/media-gallery/MediaGridItem.tsx b/ts/components/conversation/media-gallery/MediaGridItem.tsx
index 79cb0735fc5..1dd5aeb394c 100644
--- a/ts/components/conversation/media-gallery/MediaGridItem.tsx
+++ b/ts/components/conversation/media-gallery/MediaGridItem.tsx
@@ -3,7 +3,6 @@
  */
 import React from 'react';
 
-import { LoadingIndicator } from './LoadingIndicator';
 import { Message } from './propTypes/Message';
 
 interface Props {
@@ -33,7 +32,7 @@ export class MediaGridItem extends React.Component<Props, {}> {
     const { message } = this.props;
 
     if (!message.objectURL) {
-      return <LoadingIndicator />;
+      return null;
     }
 
     return (