diff --git a/core/models.py b/core/models.py
index 499faf4c1f88520b0339ed296f5c1cbe804bf66e..d9514d48944d4ece15e3d5b5d281c177c64304f8 100644
--- a/core/models.py
+++ b/core/models.py
@@ -47,9 +47,10 @@ def get_annotated_tutor_list() -> QuerySet:
 
 
 def get_random_element_from_queryset(queryset):
-    length = queryset.count()
+    qs_elements = queryset.all()
+    length = len(qs_elements)
     index = secrets.choice(range(length))
-    return queryset.all()[index]
+    return qs_elements[index]
 
 
 class ExamType(models.Model):
diff --git a/grady/settings/default.py b/grady/settings/default.py
index 2dd99ba6223153554cc8a34bcdbc7502e7e21c70..5d168606f6d449bebe8e3615ab7cd3e1a6fcf3c7 100644
--- a/grady/settings/default.py
+++ b/grady/settings/default.py
@@ -92,6 +92,7 @@ DATABASES = {
         'PASSWORD': os.environ.get('DB_PASSWORD', 'postgres'),
         'HOST': os.environ.get('DB_HOST', 'localhost'),
         'PORT': os.environ.get('DB_PORT', '5432'),
+        'ATOMIC_REQUESTS': True
     },
 }