diff --git a/aqt/mediasrv.py b/aqt/mediasrv.py
index 9e4151169..4c43f21f1 100644
--- a/aqt/mediasrv.py
+++ b/aqt/mediasrv.py
@@ -10,7 +10,7 @@ import errno
 class MediaServer(QThread):
 
     def run(self):
-        self.port = 8080
+        self.port = 10000
         self.server = None
         while not self.server:
             try:
@@ -26,6 +26,22 @@ class MediaServer(QThread):
 
 class RequestHandler(http.server.SimpleHTTPRequestHandler):
 
+    def do_GET(self):
+        f = self.send_head()
+        if f:
+            try:
+                self.copyfile(f, self.wfile)
+            except Exception as e:
+                if os.getenv("ANKIDEV"):
+                    print("http server caught exception:", e)
+                else:
+                    # swallow it - user likely surfed away from
+                    # review screen before an image had finished
+                    # downloading
+                    pass
+            finally:
+                f.close()
+
     def send_head(self):
         path = self.translate_path(self.path)
         if os.path.isdir(path):