diff --git a/src/paperless/settings.py b/src/paperless/settings.py
index 0e9ab53f3..39504fe54 100644
--- a/src/paperless/settings.py
+++ b/src/paperless/settings.py
@@ -148,7 +148,8 @@ LOGIN_URL = BASE_URL + "accounts/login/"
 WSGI_APPLICATION = 'paperless.wsgi.application'
 ASGI_APPLICATION = "paperless.asgi.application"
 
-STATIC_URL = os.getenv("PAPERLESS_STATIC_URL", "static/")
+STATIC_URL = os.getenv("PAPERLESS_STATIC_URL", BASE_URL + "static/")
+WHITENOISE_STATIC_PREFIX = "/static/"
 
 # TODO: what is this used for?
 TEMPLATES = [