diff --git a/recipes/urls.py b/recipes/urls.py
index 80e0f92d..977e236a 100644
--- a/recipes/urls.py
+++ b/recipes/urls.py
@@ -14,9 +14,11 @@ Including another URLconf
     2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
 """
 from django.conf import settings
+from django.conf.urls import url
 from django.conf.urls.static import static
 from django.urls import include, path
 from django.contrib import admin
+from django.views.static import serve
 
 urlpatterns = [
     path('', include('cookbook.urls')),
@@ -25,4 +27,5 @@ urlpatterns = [
     path('i18n/', include('django.conf.urls.i18n')),
 ]
 
-urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
+if settings.GUNICORN_MEDIA or settings.DEBUG:
+    urlpatterns += url(r'^media/(?P<path>.*)$', serve, {'document_root': settings.MEDIA_ROOT}),