diff --git a/smash/smash/urls.py b/smash/smash/urls.py
index a192a4313717c90d01ab3fc0bd8581a5dda95eb5..5af09ebd34ce85c152266ea152fb3e3389349f30 100644
--- a/smash/smash/urls.py
+++ b/smash/smash/urls.py
@@ -13,20 +13,23 @@ Including another URLconf
     1. Import the include() function: from django.conf.urls import url, include
     2. Add a URL to urlpatterns:  url(r'^blog/', include('blog.urls'))
 """
+import re
 
 from django.conf import settings
 from django.conf.urls import url, include
-from django.conf.urls.static import static
 from django.contrib import admin
-
+from django.urls import re_path
+from django.views.static import serve
 from two_factor.urls import urlpatterns as tf_urls
 
 from web import api_urls
 from web import urls
 
 urlpatterns = [
-                  url(r'^admin/', admin.site.urls),
-                  url(r'', include(urls)),
-                  url(r'^api/', include(api_urls)),
-                  url(r'', include(tf_urls)),
-              ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
+    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})
+]