diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 18b00cab93b05b29258c124088c08af2cfb2031f..76500e4bf61ee66e3b7f2796e5ae207e678e89a8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -140,7 +140,6 @@ test_api:
     paths:
       - "$PIP_CACHE_DIR"
   variables:
-    DJANGO_ALLOWED_HOSTS: "localhost"
     DATABASE_URL: "postgresql://postgres@postgres/postgres"
     FUNKWHALE_URL: "https://funkwhale.ci"
     DJANGO_SETTINGS_MODULE: config.settings.local
diff --git a/api/config/settings/common.py b/api/config/settings/common.py
index a445e102cfc5ef07487379243cf089db0217d0c6..cd1b3208a6f6af59fb6ef3080754283c86ca8981 100644
--- a/api/config/settings/common.py
+++ b/api/config/settings/common.py
@@ -60,7 +60,7 @@ FEDERATION_MUSIC_NEEDS_APPROVAL = env.bool(
 )
 # XXX: deprecated, see #186
 FEDERATION_ACTOR_FETCH_DELAY = env.int("FEDERATION_ACTOR_FETCH_DELAY", default=60 * 12)
-ALLOWED_HOSTS = env.list("DJANGO_ALLOWED_HOSTS")
+ALLOWED_HOSTS = env.list("DJANGO_ALLOWED_HOSTS", default=[]) + [FUNKWHALE_HOSTNAME]
 
 # APP CONFIGURATION
 # ------------------------------------------------------------------------------
diff --git a/changes/changelog.d/allowed-hosts.enhancement b/changes/changelog.d/allowed-hosts.enhancement
new file mode 100644
index 0000000000000000000000000000000000000000..bd52e25ff0a260edd5bbcad86a70d8f05509884f
--- /dev/null
+++ b/changes/changelog.d/allowed-hosts.enhancement
@@ -0,0 +1 @@
+Removed the need to specify the DJANGO_ALLOWED_HOSTS variable
diff --git a/demo/env.sample b/demo/env.sample
index 0c9668765d31e9742a76398d7bfde3f313c52c8e..a41eee2b4a709f816fd4878f5d1c8a46d69e8f33 100644
--- a/demo/env.sample
+++ b/demo/env.sample
@@ -1,5 +1,4 @@
 FUNKWHALE_URL=https://demo.funkwhale.audio/
-DJANGO_ALLOWED_HOSTS=demo.funkwhale.audio
 FUNKWHALE_API_PORT=5001
 DJANGO_SECRET_KEY=demo
 DATABASE_URL=postgresql://postgres@postgres/postgres
diff --git a/deploy/env.prod.sample b/deploy/env.prod.sample
index 3918f95e399237051ee010e52aa0a2921962d7ba..fe4fe5550760b47945d64a99f02be7d0fdcd9243 100644
--- a/deploy/env.prod.sample
+++ b/deploy/env.prod.sample
@@ -4,7 +4,6 @@
 # If you're tweaking this file from the template, ensure you edit at least the
 # following variables:
 # - DJANGO_SECRET_KEY
-# - DJANGO_ALLOWED_HOSTS
 # - FUNKWHALE_HOSTNAME
 # - EMAIL_CONFIG and DEFAULT_FROM_EMAIL if you plan to send emails)
 # On non-docker setup **only**, you'll also have to tweak/uncomment those variables:
@@ -85,11 +84,6 @@ MEDIA_ROOT=/srv/funkwhale/data/media
 # (Ensure this directory actually exists)
 STATIC_ROOT=/srv/funkwhale/data/static
 
-# Update it to match the domain that will be used to reach your funkwhale
-# instance
-# Example: DJANGO_ALLOWED_HOSTS=funkwhale.yourdomain.com
-DJANGO_ALLOWED_HOSTS=yourdomain
-
 # which settings module should django use?
 # You don't have to touch this unless you really know what you're doing
 DJANGO_SETTINGS_MODULE=config.settings.production