diff --git a/synapse/rest/media/v1/media_repository.py b/synapse/rest/media/v1/media_repository.py
index 65b16ce4c..5c50646bc 100644
--- a/synapse/rest/media/v1/media_repository.py
+++ b/synapse/rest/media/v1/media_repository.py
@@ -263,10 +263,7 @@ class MediaRepository(object):
         )
 
         responder = yield self.media_storage.fetch_media(file_info)
-        if responder:
-            defer.returnValue((responder, media_info))
-
-        defer.returnValue((None, media_info))
+        defer.returnValue((responder, media_info))
 
     @defer.inlineCallbacks
     def _download_remote_file(self, server_name, media_id, file_id):