Index: django/contrib/staticfiles/handlers.py
===================================================================
--- django/contrib/staticfiles/handlers.py	(revision 15371)
+++ django/contrib/staticfiles/handlers.py	(working copy)
@@ -40,9 +40,12 @@
 
         * the host is provided as part of the base_url
         * the request's path isn't under the media path (or equal)
+        * the request's path is under MEDIA_URL
         """
-        return (self.base_url[2] != path and
-            path.startswith(self.base_url[2]) and not self.base_url[1])
+        return (self.base_url[2] != path
+                and path.startswith(self.base_url[2])
+                and not self.base_url[1]
+                and not path.startswith(settings.MEDIA_URL))
 
     def file_path(self, url):
         """