diff --git a/lib/Util/License/Features/Subscribers.php b/lib/Util/License/Features/Subscribers.php
index 38767f9b54..bfec3aa57e 100644
--- a/lib/Util/License/Features/Subscribers.php
+++ b/lib/Util/License/Features/Subscribers.php
@@ -25,8 +25,10 @@ class Subscribers {
   }
 
   public function check() {
+    $limit = $this->getSubscribersLimit();
+    if ($limit === false) return false;
     $subscribers_count = $this->subscribers_repository->getTotalSubscribers();
-    return $subscribers_count > $this->getSubscribersLimit();
+    return $subscribers_count > $limit;
   }
 
   public function hasAPIKey() {
@@ -44,6 +46,8 @@ class Subscribers {
     $premium_subscribers_limit = $this->settings->get(self::PREMIUM_SUBSCRIBERS_LIMIT_SETTING_KEY);
     if ($has_premium_key && !empty($premium_subscribers_limit)) return (int)$premium_subscribers_limit;
 
+    if ($has_mss_key || $has_premium_key) return false;
+
     $installation_time = strtotime($this->settings->get('installed_at'));
     $old_user = $installation_time < strtotime(self::NEW_LIMIT_DATE);
     return $old_user ? self::SUBSCRIBERS_OLD_LIMIT : self::SUBSCRIBERS_NEW_LIMIT;
diff --git a/views/newsletters.html b/views/newsletters.html
index 41c9d657d0..60cf9f339b 100644
--- a/views/newsletters.html
+++ b/views/newsletters.html
@@ -8,7 +8,7 @@
       var mailpoet_update_available = <%= is_mailpoet_update_available ? 'true' : 'false' %>
       var mailpoet_listing_per_page = <%= items_per_page %>;
       var mailpoet_display_nps_poll = <%= (sent_newsletters_count > 0 and settings.display_nps_poll) ? 'true' : 'false' %>;
-      var mailpoet_subscribers_limit = <%= subscribers_limit %>;
+      var mailpoet_subscribers_limit = <%= subscribers_limit ? subscribers_limit : 'false'  %>;
       var mailpoet_subscribers_limit_reached = <%= subscribers_limit_reached ? 'true' : 'false' %>;
       var mailpoet_has_api_key = <%= has_api_key ? 'true' : 'false' %>;
       var mailpoet_segments = <%= json_encode(segments) %>;