diff --git a/anki/collection.py b/anki/collection.py
index 201980ed4..89bf7b56d 100644
--- a/anki/collection.py
+++ b/anki/collection.py
@@ -45,7 +45,7 @@ class _Collection(object):
         self.server = server
         self._lastSave = time.time()
         self.clearUndo()
-        self.media = MediaManager(self)
+        self.media = MediaManager(self, server)
         self.models = ModelManager(self)
         self.decks = DeckManager(self)
         self.tags = TagManager(self)
diff --git a/anki/media.py b/anki/media.py
index fd72b126c..414350cdb 100644
--- a/anki/media.py
+++ b/anki/media.py
@@ -17,8 +17,10 @@ class MediaManager(object):
     regexps = ("(?i)(\[sound:([^]]+)\])",
                "(?i)(<img[^>]+src=[\"']?([^\"'>]+)[\"']?[^>]*>)")
 
-    def __init__(self, col):
+    def __init__(self, col, server):
         self.col = col
+        if server:
+            return
         # media directory
         self._dir = re.sub("(?i)\.(anki2)$", ".media", self.col.path)
         # convert dir to unicode if it's not already