diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2b2085a0b..65480407e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 - More explanations in the setup script
 - Send pre-compressed assets to the browsers instead of the regular ones
 - Fix a bug: subscriptions tab is selected by default in statistics, even if the module is disabled
+- Fix a bug: select all plans for slot restriction (through the dedicated button) also selects the disabled plans
 - Fix a security issue: updated elliptic to 6.5.4 to fix [CVE-2020-28498](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-28498)
 - [TODO DEPLOY] `\curl -sSL https://raw.githubusercontent.com/sleede/fab-manager/master/scripts/nginx-packs-directive.sh | bash`
 - [TODO DEPLOY] `rails db:seed`
diff --git a/app/frontend/src/javascript/controllers/admin/calendar.js b/app/frontend/src/javascript/controllers/admin/calendar.js
index 3f84b0d35..79cf9a094 100644
--- a/app/frontend/src/javascript/controllers/admin/calendar.js
+++ b/app/frontend/src/javascript/controllers/admin/calendar.js
@@ -665,7 +665,7 @@ Application.Controllers.controller('CreateEventModalController', ['$scope', '$ui
       $scope.selectedPlans = [];
       $scope.selectedPlansBinding = {};
       if (count === 0) {
-        plansPromise.forEach(function (plan) {
+        plansPromise.filter(p => !p.disabled).forEach(function (plan) {
           $scope.selectedPlans.push(plan);
           $scope.selectedPlansBinding[plan.id] = true;
         });