diff --git a/src/paperless/settings.py b/src/paperless/settings.py
index c80434bc7..1e946d0b0 100644
--- a/src/paperless/settings.py
+++ b/src/paperless/settings.py
@@ -31,6 +31,11 @@ LOGIN_URL = '/admin/login'
 
 ALLOWED_HOSTS = []
 
+# Tap paperless.conf if it's available
+if os.path.exists("/etc/paperless.conf"):
+    load_dotenv("/etc/paperless.conf")
+
+
 
 # Application definition
 
@@ -90,9 +95,10 @@ WSGI_APPLICATION = 'paperless.wsgi.application'
 DATABASES = {
     "default": {
         "ENGINE": "django.db.backends.sqlite3",
-        "NAME": os.path.join(BASE_DIR, "..", "data", "db.sqlite3"),
+        "NAME": os.path.join(os.getenv("PAPERLESS_DBLOCATION",os.path.join(BASE_DIR, "..", "data")), "db.sqlite3")
     }
 }
+print(DATABASES)
 if os.getenv("PAPERLESS_DBUSER") and os.getenv("PAPERLESS_DBPASS"):
     DATABASES["default"] = {
         "ENGINE": "django.db.backends.postgresql_psycopg2",
@@ -150,11 +156,6 @@ MEDIA_URL = "/media/"
 # values in /etc/paperless.conf instead.
 # ----------------------------------------------------------------------------
 
-# Tap paperless.conf if it's available
-if os.path.exists("/etc/paperless.conf"):
-    load_dotenv("/etc/paperless.conf")
-
-
 # Logging
 
 LOGGING = {