diff --git a/smash/smash/urls.py b/smash/smash/urls.py
index 5af09ebd34ce85c152266ea152fb3e3389349f30..229328a8202d3f5a77ed622135d097dab9151030 100644
--- a/smash/smash/urls.py
+++ b/smash/smash/urls.py
@@ -29,7 +29,9 @@ urlpatterns = [
     url(r'^admin/', admin.site.urls),
     url(r'', include(urls)),
     url(r'^api/', include(api_urls)),
-    url(r'', include(tf_urls)),
-    re_path(r'^%s(?P<path>.*)$' % re.escape(settings.MEDIA_URL.lstrip('/')), serve,
-            {'document_root': settings.MEDIA_ROOT})
+    url(r'', include(tf_urls))
 ]
+
+if settings.SERVE_STATIC or settings.DEBUG:
+    urlpatterns.append(re_path(r'^%s(?P<path>.*)$' % re.escape(settings.MEDIA_URL.lstrip('/')), serve,
+                               {'document_root': settings.MEDIA_ROOT}))