diff --git a/src/Controller/AbstractCrudController.php b/src/Controller/AbstractCrudController.php
index a37be7d99e..353a6e8954 100644
--- a/src/Controller/AbstractCrudController.php
+++ b/src/Controller/AbstractCrudController.php
@@ -403,7 +403,7 @@ public function autocomplete(AdminContext $context): JsonResponse
         /** @var CrudControllerInterface $controller */
         $controller = $this->get(ControllerFactory::class)->getCrudControllerInstance($autocompleteContext['crudId'], Action::INDEX, $context->getRequest());
         /** @var FieldDto $field */
-        $field = FieldCollection::new($controller->configureFields(Crud::PAGE_INDEX))->get($autocompleteContext['propertyName']);
+        $field = FieldCollection::new($controller->configureFields($autocompleteContext['originatingPage']))->get($autocompleteContext['propertyName']);
         /** @var \Closure|null $queryBuilderCallable */
         $queryBuilderCallable = $field->getCustomOption(AssociationField::OPTION_QUERY_BUILDER_CALLABLE);
 
diff --git a/src/Field/Configurator/AssociationConfigurator.php b/src/Field/Configurator/AssociationConfigurator.php
index cdafa51873..e00b22c707 100644
--- a/src/Field/Configurator/AssociationConfigurator.php
+++ b/src/Field/Configurator/AssociationConfigurator.php
@@ -76,6 +76,7 @@ public function configure(FieldDto $field, EntityDto $entityDto, AdminContext $c
                 ->set(AssociationField::PARAM_AUTOCOMPLETE_CONTEXT, [
                     'crudId' => $context->getRequest()->query->get('crudId'),
                     'propertyName' => $propertyName,
+                    'originatingPage' => $context->getCrud()->getCurrentPage(),
                 ])
                 ->generateUrl();