diff --git a/mailpoet/lib/AdminPages/Pages/Newsletters.php b/mailpoet/lib/AdminPages/Pages/Newsletters.php
index 5555d31f72..07e9861186 100644
--- a/mailpoet/lib/AdminPages/Pages/Newsletters.php
+++ b/mailpoet/lib/AdminPages/Pages/Newsletters.php
@@ -142,8 +142,8 @@ class Newsletters {
 
     if ($this->bridge->isMailpoetSendingServiceEnabled()) {
       $data['authorized_emails'] = $this->bridge->getAuthorizedEmailAddresses();
-      $data['verified_sender_domains'] = array_values($this->senderDomainController->getFullyVerifiedSenderDomains(true));
-      $data['partially_verified_sender_domains'] = array_values($this->senderDomainController->getPartiallyVerifiedSenderDomains(true));
+      $data['verified_sender_domains'] = $this->senderDomainController->getFullyVerifiedSenderDomains(true);
+      $data['partially_verified_sender_domains'] = $this->senderDomainController->getPartiallyVerifiedSenderDomains(true);
       $data['all_sender_domains'] = $this->senderDomainController->getAllSenderDomains();
       $data['sender_restrictions'] = [
         'lowerLimit' => AuthorizedSenderDomainController::LOWER_LIMIT,
diff --git a/mailpoet/lib/AdminPages/Pages/Settings.php b/mailpoet/lib/AdminPages/Pages/Settings.php
index 70fa47c39d..54048fab23 100644
--- a/mailpoet/lib/AdminPages/Pages/Settings.php
+++ b/mailpoet/lib/AdminPages/Pages/Settings.php
@@ -101,8 +101,8 @@ class Settings {
 
     if ($this->bridge->isMailpoetSendingServiceEnabled() && $mpApiKeyValid) {
       $data['authorized_emails'] = $this->bridge->getAuthorizedEmailAddresses();
-      $data['verified_sender_domains'] = array_values($this->senderDomainController->getFullyVerifiedSenderDomains(true));
-      $data['partially_verified_sender_domains'] = array_values($this->senderDomainController->getPartiallyVerifiedSenderDomains(true));
+      $data['verified_sender_domains'] = $this->senderDomainController->getFullyVerifiedSenderDomains(true);
+      $data['partially_verified_sender_domains'] = $this->senderDomainController->getPartiallyVerifiedSenderDomains(true);
       $data['all_sender_domains'] = $this->senderDomainController->getAllSenderDomains();
       $data['sender_restrictions'] = [
         'lowerLimit' => AuthorizedSenderDomainController::LOWER_LIMIT,
diff --git a/mailpoet/lib/Services/AuthorizedSenderDomainController.php b/mailpoet/lib/Services/AuthorizedSenderDomainController.php
index 67119681ae..f7dad23f5d 100644
--- a/mailpoet/lib/Services/AuthorizedSenderDomainController.php
+++ b/mailpoet/lib/Services/AuthorizedSenderDomainController.php
@@ -168,26 +168,25 @@ class AuthorizedSenderDomainController {
 
   public function getFullyVerifiedSenderDomains($domainsOnly = false): array {
     $domainData = $this->getSenderDomainsByStatus(self::OVERALL_STATUS_VERIFIED);
-    if ($domainsOnly) {
-      return array_map([$this, 'domainExtractor'], $domainData);
-    }
-    return $domainData;
+    return $domainsOnly ? $this->extractDomains($domainData) : $domainData;
   }
 
   public function getPartiallyVerifiedSenderDomains($domainsOnly = false): array {
     $domainData = $this->getSenderDomainsByStatus(self::OVERALL_STATUS_PARTIALLY_VERIFIED);
-    if ($domainsOnly) {
-      return array_map([$this, 'domainExtractor'], $domainData);
-    }
-    return $domainData;
+    return $domainsOnly ? $this->extractDomains($domainData) : $domainData;
   }
 
   public function getUnverifiedSenderDomains($domainsOnly = false): array {
     $domainData = $this->getSenderDomainsByStatus(self::OVERALL_STATUS_UNVERIFIED);
-    if ($domainsOnly) {
-      return array_map([$this, 'domainExtractor'], $domainData);
+    return $domainsOnly ? $this->extractDomains($domainData) : $domainData;
+  }
+
+  private function extractDomains(array $domainData): array {
+    $extractedDomains = [];
+    foreach ($domainData as $data) {
+      $extractedDomains[] = $this->domainExtractor($data);
     }
-    return $domainData;
+    return $extractedDomains;
   }
 
   private function domainExtractor(array $domainData): string {