diff --git a/cookbook/models.py b/cookbook/models.py
index 67679a897..1394ad85f 100644
--- a/cookbook/models.py
+++ b/cookbook/models.py
@@ -62,9 +62,10 @@ class TreeManager(MP_NodeManager):
     # model.Manager get_or_create() is not compatible with MP_Tree
     def get_or_create(self, *args, **kwargs):
         kwargs['name'] = kwargs['name'].strip()
-        try:
-            return self.get(name__iexact=kwargs['name'], space=kwargs['space']), False
-        except self.model.DoesNotExist:
+
+        if obj := self.filter(name__iexact=kwargs['name'], space=kwargs['space']).first():
+            return obj, False
+        else:
             with scopes_disabled():
                 try:
                     defaults = kwargs.pop('defaults', None)