diff --git a/Civi/Api4/Service/Autocomplete/CountryAutocompleteProvider.php b/Civi/Api4/Service/Autocomplete/CountryAutocompleteProvider.php
new file mode 100644
index 000000000000..d047bbcb3698
--- /dev/null
+++ b/Civi/Api4/Service/Autocomplete/CountryAutocompleteProvider.php
@@ -0,0 +1,50 @@
+<?php
+
+/*
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC. All rights reserved.                        |
+ |                                                                    |
+ | This work is published under the GNU AGPLv3 license with some      |
+ | permitted exceptions and without any warranty. For full license    |
+ | and copyright information, see https://civicrm.org/licensing       |
+ +--------------------------------------------------------------------+
+ */
+
+namespace Civi\Api4\Service\Autocomplete;
+
+use Civi\Core\Event\GenericHookEvent;
+use Civi\Core\HookInterface;
+
+/**
+ * @service
+ * @internal
+ */
+class CountryAutocompleteProvider extends \Civi\Core\Service\AutoService implements HookInterface {
+
+  /**
+   * Provide default SearchDisplay for Country autocompletes
+   *
+   * @param \Civi\Core\Event\GenericHookEvent $e
+   */
+  public static function on_civi_search_defaultDisplay(GenericHookEvent $e) {
+    if ($e->display['settings'] || $e->display['type'] !== 'autocomplete' || $e->savedSearch['api_entity'] !== 'Country') {
+      return;
+    }
+    $e->display['settings'] = [
+      'sort' => [
+        ['name', 'ASC'],
+      ],
+      'columns' => [
+        [
+          'type' => 'field',
+          'key' => 'name',
+        ],
+        [
+          'type' => 'field',
+          'key' => 'iso_code',
+        ],
+      ],
+    ];
+  }
+
+}