diff --git a/lib/Models/Subscriber.php b/lib/Models/Subscriber.php
index c9c36afff5..4ea51e2c7b 100644
--- a/lib/Models/Subscriber.php
+++ b/lib/Models/Subscriber.php
@@ -226,7 +226,14 @@ class Subscriber extends Model {
     if (isset($data['filter']['segment']) && $data['filter']['segment'] === $wpSegment->id) {
       return $query;
     }
-    $query->whereNull('wp_user_id');
+    $settings = SettingsController::getInstance();
+    if (
+      ($settings->get('premium.premium_key_state.state') === 'valid')
+      &&
+      ($settings->get('premium.premium_key_state.data.support_tier') === 'premium')
+    ) {
+      $query->whereNull('wp_user_id');
+    }
     return $query;
   }
 
diff --git a/lib/Util/License/Features/Subscribers.php b/lib/Util/License/Features/Subscribers.php
index a7156fb395..daef935bd6 100644
--- a/lib/Util/License/Features/Subscribers.php
+++ b/lib/Util/License/Features/Subscribers.php
@@ -85,7 +85,7 @@ class Subscribers {
   }
 
   private function hasPremiumSupport() {
-    return $this->hasValidApiKey() && $this->settings->get(self::PREMIUM_SUPPORT_SETTING_KEY) === 'premium';
+    return $this->hasValidPremiumKey() && $this->settings->get(self::PREMIUM_SUPPORT_SETTING_KEY) === 'premium';
   }
 
   private function getFreeSubscribersLimit() {