diff --git a/cmsmanage/settings.py b/cmsmanage/settings.py
index 0d02ab8..11d158c 100644
--- a/cmsmanage/settings.py
+++ b/cmsmanage/settings.py
@@ -28,7 +28,11 @@ class Base(Configuration):
     @classmethod
     def setup(cls):
         super().setup()
-        cls.DATABASES["default"]["OPTIONS"] = {"pool": True}
+
+        # TODO: this is a nasty hack, since the connection
+        #       pool doesn't seem to work well with django-q2
+        if "qcluster" not in sys.argv:
+            cls.DATABASES["default"]["OPTIONS"] = {"pool": True}
 
     INSTALLED_APPS = [
         "dal",