diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 2449b5d35de313e28a857415e993bce7258b59cd..4022882bcbd013fb6bee4f38c3ed3d3574dc92a2 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -9,6 +9,11 @@ and this project adheres to `Semantic Versioning`_.
 Unreleased
 ----------
 
+Changed
+~~~~~~~
+
+* Allow disabling query caching with cachalot
+
 Fixed
 ~~~~~
 
diff --git a/aleksis/core/settings.py b/aleksis/core/settings.py
index 295485ad87f188b9763a373af33888b1003479e8..22d77d8c8baf42c823d8c8efc8d13a2039270e8a 100644
--- a/aleksis/core/settings.py
+++ b/aleksis/core/settings.py
@@ -273,6 +273,7 @@ DEBUG_TOOLBAR_PANELS.append("cachalot.panels.CachalotPanel")
 CACHALOT_TIMEOUT = _settings.get("caching.cachalot.timeout", None)
 CACHALOT_DATABASES = set(["default", "default_oot"])
 SILENCED_SYSTEM_CHECKS += ["cachalot.W001"]
+CACHALOT_ENABLED = _settings.get("caching.query_caching", True)
 
 SESSION_ENGINE = "django.contrib.sessions.backends.cache"
 SESSION_CACHE_ALIAS = "default"