diff --git a/native/media/remote-image.react.js b/native/media/remote-image.react.js
index 607ca8054..14b070dc4 100644
--- a/native/media/remote-image.react.js
+++ b/native/media/remote-image.react.js
@@ -1,79 +1,103 @@
 // @flow
 
 import invariant from 'invariant';
 import * as React from 'react';
 import type { ImageSource } from 'react-native/Libraries/Image/ImageSource';
 
 import { connectionSelector } from 'lib/selectors/keyserver-selectors.js';
 import { type ConnectionStatus } from 'lib/types/socket-types.js';
 
 import LoadableImage from './loadable-image.react.js';
 import { useSelector } from '../redux/redux-utils.js';
 import type { ImageStyle } from '../types/styles.js';
 
 type BaseProps = {
   +uri: string,
   +onLoad?: (uri: string) => void,
   +spinnerColor: string,
   +style: ImageStyle,
   +invisibleLoad: boolean,
   +placeholder?: ?ImageSource,
 };
 type Props = {
   ...BaseProps,
   +connectionStatus: ConnectionStatus,
 };
 type State = {
   +attempt: number,
 };
 class RemoteImage extends React.PureComponent<Props, State> {
   loaded: boolean = false;
   state: State = {
     attempt: 0,
   };
 
   componentDidUpdate(prevProps: Props) {
     if (
       !this.loaded &&
       this.props.connectionStatus === 'connected' &&
       prevProps.connectionStatus !== 'connected'
     ) {
       this.setState(otherPrevState => ({
         attempt: otherPrevState.attempt + 1,
       }));
     }
   }
 
   render() {
     const { style, spinnerColor, invisibleLoad, uri, placeholder } = this.props;
     const source = { uri };
 
     return (
       <LoadableImage
         source={source}
         placeholder={placeholder}
         onLoad={this.onLoad}
         spinnerColor={spinnerColor}
         style={style}
         invisibleLoad={invisibleLoad}
         key={this.state.attempt}
       />
     );
   }
 
   onLoad = () => {
     this.loaded = true;
     this.props.onLoad && this.props.onLoad(this.props.uri);
   };
 }
 
-const ConnectedRemoteImage: React.ComponentType<BaseProps> =
-  React.memo<BaseProps>(function ConnectedRemoteImage(props: BaseProps) {
-    const connection = useSelector(connectionSelector);
-    invariant(connection, 'keyserver missing from keyserverStore');
-    const connectionStatus = connection.status;
+function ConnectedRemoteImage(props: BaseProps): React.Node {
+  const connection = useSelector(connectionSelector);
+  invariant(connection, 'keyserver missing from keyserverStore');
+  const connectionStatus = connection.status;
 
-    return <RemoteImage {...props} connectionStatus={connectionStatus} />;
-  });
+  const { uri, onLoad, spinnerColor, style, invisibleLoad, placeholder } =
+    props;
+
+  const connectedRemoteImage = React.useMemo(
+    () => (
+      <RemoteImage
+        uri={uri}
+        onLoad={onLoad}
+        spinnerColor={spinnerColor}
+        style={style}
+        invisibleLoad={invisibleLoad}
+        placeholder={placeholder}
+        connectionStatus={connectionStatus}
+      />
+    ),
+    [
+      connectionStatus,
+      invisibleLoad,
+      onLoad,
+      placeholder,
+      spinnerColor,
+      style,
+      uri,
+    ],
+  );
+  return connectedRemoteImage;
+}
 
 export default ConnectedRemoteImage;