diff --git a/keyserver/src/fetchers/upload-fetchers.js b/keyserver/src/fetchers/upload-fetchers.js
--- a/keyserver/src/fetchers/upload-fetchers.js
+++ b/keyserver/src/fetchers/upload-fetchers.js
@@ -139,7 +139,18 @@
   mediaMessageContents: $ReadOnlyArray<MediaMessageServerDBContent>,
 ): Promise<$ReadOnlyArray<Media>> {
   const uploads = await fetchUploadsForMessage(viewer, mediaMessageContents);
-  const uploadMap = _keyBy('uploadID')(uploads);
+
+  return constructMediaFromMediaMessageContentsAndUploadRows(
+    mediaMessageContents,
+    uploads,
+  );
+}
+
+function constructMediaFromMediaMessageContentsAndUploadRows(
+  mediaMessageContents: $ReadOnlyArray<MediaMessageServerDBContent>,
+  uploadRows: $ReadOnlyArray<Object>,
+): $ReadOnlyArray<Media> {
+  const uploadMap = _keyBy('uploadID')(uploadRows);
 
   const media: Media[] = [];
   for (const mediaMessageContent of mediaMessageContents) {
@@ -194,4 +205,5 @@
   mediaFromRow,
   fetchMedia,
   fetchMediaFromMediaMessageContent,
+  constructMediaFromMediaMessageContentsAndUploadRows,
 };