diff --git a/lib/assets/javascripts/builder/data/user-model.js b/lib/assets/javascripts/builder/data/user-model.js
index b34b5e3da9..85b1001d34 100755
--- a/lib/assets/javascripts/builder/data/user-model.js
+++ b/lib/assets/javascripts/builder/data/user-model.js
@@ -128,12 +128,13 @@ var UserModel = Backbone.Model.extend({
   },
 
   hasPublicMapsLimits: function () {
-    return this.isIndividualUser() || this.isFree2020User();
+    const userWithLimits = this.isIndividualUser() || this.isFree2020User();
+    return userWithLimits && !this.hasUnlimitedPublicMaps();
   },
 
   hasRemainingPublicMaps: function () {
     if (this.hasPublicMapsLimits()) {
-      return this.hasUnlimitedPublicMaps() || this.get('public_map_quota') > this.getTotalPublicMapsCount();
+      return this.get('public_map_quota') > this.getTotalPublicMapsCount();
     }
     return true;
   },
@@ -151,12 +152,13 @@ var UserModel = Backbone.Model.extend({
   },
 
   hasPrivateMapsLimits: function () {
-    return this.isFree2020User();
+    const userWithLimits = this.isFree2020User();
+    return userWithLimits && !this.hasUnlimitedPrivateMaps();
   },
 
   hasRemainingPrivateMaps: function () {
     if (this.hasPrivateMapsLimits()) {
-      return this.hasUnlimitedPrivateMaps() || this.get('private_map_quota') > this.getTotalPrivateMapsCount();
+      return this.get('private_map_quota') > this.getTotalPrivateMapsCount();
     }
     return true;
   },
diff --git a/lib/assets/javascripts/dashboard/data/user-model.js b/lib/assets/javascripts/dashboard/data/user-model.js
index 2dfb1775c2..37e6099b25 100644
--- a/lib/assets/javascripts/dashboard/data/user-model.js
+++ b/lib/assets/javascripts/dashboard/data/user-model.js
@@ -152,12 +152,13 @@ const UserModel = Backbone.Model.extend({
   },
 
   hasPublicMapsLimits: function () {
-    return this.isIndividualUser() || this.isFree2020User();
+    const userWithLimits = this.isIndividualUser() || this.isFree2020User();
+    return userWithLimits && !this.hasUnlimitedPublicMaps();
   },
 
   hasRemainingPublicMaps: function () {
     if (this.hasPublicMapsLimits()) {
-      return this.hasUnlimitedPublicMaps() || this.get('public_map_quota') > this.getTotalPublicMapsCount();
+      return this.get('public_map_quota') > this.getTotalPublicMapsCount();
     }
     return true;
   },
@@ -175,12 +176,13 @@ const UserModel = Backbone.Model.extend({
   },
 
   hasPrivateMapsLimits: function () {
-    return this.isFree2020User();
+    const userWithLimits = this.isFree2020User();
+    return userWithLimits && !this.hasUnlimitedPrivateMaps();
   },
 
   hasRemainingPrivateMaps: function () {
     if (this.hasPrivateMapsLimits()) {
-      return this.hasUnlimitedPrivateMaps() || this.get('private_map_quota') > this.getTotalPrivateMapsCount();
+      return this.get('private_map_quota') > this.getTotalPrivateMapsCount();
     }
     return true;
   },