diff --git a/api/funkwhale_api/taskapp/celery.py b/api/funkwhale_api/taskapp/celery.py
index 92fb2a0d9abad41e1b8810bc7515bb1e691aeaef..e86cf0eae7c4b6b8fc96d8922d168da19e5142f3 100644
--- a/api/funkwhale_api/taskapp/celery.py
+++ b/api/funkwhale_api/taskapp/celery.py
@@ -14,7 +14,7 @@ logger = logging.getLogger("celery")
 if not settings.configured:
     # set the default Django settings module for the 'celery' program.
     os.environ.setdefault(
-        "DJANGO_SETTINGS_MODULE", "config.settings.local"
+        "DJANGO_SETTINGS_MODULE", "config.settings.production"
     )  # pragma: no cover
 
 app = celery.Celery("funkwhale_api")
diff --git a/api/requirements/base.txt b/api/requirements/base.txt
index e770b3882322f6d08204ef4296899caa58a2bf7b..b05be4bff99ae5587ec78125ce410339853f41a5 100644
--- a/api/requirements/base.txt
+++ b/api/requirements/base.txt
@@ -21,7 +21,7 @@ pytz==2018.9
 # Redis support
 django-redis>=4.10,<4.11
 redis>=3.0,<3.1
-
+kombu>=4.2.2,<4.3
 
 celery>=4.2,<4.3
 
diff --git a/changes/changelog.d/celery.bugfix b/changes/changelog.d/celery.bugfix
new file mode 100644
index 0000000000000000000000000000000000000000..448a536e6acd03e69ed680afccfa3e0ff6b3dcc4
--- /dev/null
+++ b/changes/changelog.d/celery.bugfix
@@ -0,0 +1 @@
+Fixed celery worker defaulting to development settings instead of production
diff --git a/changes/changelog.d/kombu.bugfix b/changes/changelog.d/kombu.bugfix
new file mode 100644
index 0000000000000000000000000000000000000000..01469f29e9b7c7a60a602fce72b5aedbd95d71a8
--- /dev/null
+++ b/changes/changelog.d/kombu.bugfix
@@ -0,0 +1 @@
+Upgraded kombu to fix an incompatibility with redis>=3