diff --git a/procurement_auto_create_group/models/procurement_group.py b/procurement_auto_create_group/models/procurement_group.py
index 97873a264..ca9cb938c 100644
--- a/procurement_auto_create_group/models/procurement_group.py
+++ b/procurement_auto_create_group/models/procurement_group.py
@@ -13,11 +13,6 @@ class ProcurementGroup(models.Model):
         rule = super()._get_rule(product_id, location_id, values)
         # If there isn't a date planned in the values it means that this
         # method has been called outside of a procurement process.
-        if (
-            rule
-            and not values.get("group_id")
-            and rule.auto_create_group
-            and values.get("date_planned")
-        ):
+        if rule and rule.auto_create_group and values.get("date_planned"):
             values["group_id"] = rule._get_auto_procurement_group(product_id)
         return rule
diff --git a/procurement_auto_create_group/tests/test_auto_create.py b/procurement_auto_create_group/tests/test_auto_create.py
index b4b336996..f1d97f879 100644
--- a/procurement_auto_create_group/tests/test_auto_create.py
+++ b/procurement_auto_create_group/tests/test_auto_create.py
@@ -114,8 +114,12 @@ class TestProcurementAutoCreateGroup(TransactionCase):
             }
         )
 
+        self.group = self.group_obj.create({"name": "SO0001"})
+
     def _procure(self, product):
-        values = {}
+        values = {
+            "group_id": self.group,
+        }
         self.group_obj.run(
             [
                 self.env["procurement.group"].Procurement(
@@ -170,8 +174,10 @@ class TestProcurementAutoCreateGroup(TransactionCase):
             [("product_id", "=", self.prod_no_auto_pull_push.id)]
         )
         self.assertTrue(move)
-        self.assertFalse(
-            move.group_id, "Procurement Group should not have been assigned."
+        self.assertEqual(
+            move.group_id,
+            self.group,
+            "Procurement Group should not have been assigned.",
         )
 
     def test_02_pull_push_auto_create_group(self):