diff --git a/aleksis/core/settings.py b/aleksis/core/settings.py
index 3a085a7848fc4b562dac11b925a13195f903223b..f75b9bac705e7e753e565ffb55b7b106ee517418 100644
--- a/aleksis/core/settings.py
+++ b/aleksis/core/settings.py
@@ -67,6 +67,7 @@ UWSGI = {
     "module": "aleksis.core.wsgi",
 }
 UWSGI_SERVE_STATIC = True
+UWSGI_SERVE_MEDIA = True
 
 ALLOWED_HOSTS = _settings.get("http.allowed_hosts", [])
 
diff --git a/aleksis/core/urls.py b/aleksis/core/urls.py
index cd11d664845edfd9d35d553a90476bc6c6b5b0f6..f966c8dac14c021b606f2c1a3a3cd71645283203 100644
--- a/aleksis/core/urls.py
+++ b/aleksis/core/urls.py
@@ -1,6 +1,5 @@
 from django.apps import apps
 from django.conf import settings
-from django.conf.urls.static import static
 from django.contrib import admin
 from django.contrib.auth import views as auth_views
 from django.urls import include, path
@@ -199,9 +198,6 @@ urlpatterns = [
     ),
 ]
 
-# Serve media files from MEDIA_ROOT to make it work with runserver
-urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
-
 # Add URLs for optional features
 if hasattr(settings, "TWILIO_ACCOUNT_SID"):
     from two_factor.gateways.twilio.urls import urlpatterns as tf_twilio_urls  # noqa