diff --git a/CHANGELOG.md b/CHANGELOG.md
index c22785cb6..9d887b9b3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## next release
 
+- Fix a bug: hide spaces in public calendar when module is disabled
 - Fix a bug: confirmation message not shown after admin creation
 - add task `rake fablab:get_incoherent_invoice` allow find the invoices incoherent
 
diff --git a/app/assets/templates/calendar/filter.html.erb b/app/assets/templates/calendar/filter.html.erb
index b9c1b3169..c275fbeb9 100644
--- a/app/assets/templates/calendar/filter.html.erb
+++ b/app/assets/templates/calendar/filter.html.erb
@@ -18,7 +18,7 @@
     <input class="col-md-1 col-sm-1 col-xs-1" type="checkbox" ng-model="m.checked" ng-change="filterAvailabilities(filter)">
   </div>
 </div>
-<div class="m-t">
+<div class="m-t" ng-hide="fablabWithoutSpaces">
   <div class="row">
     <h3 class="col-md-11 col-sm-11 col-xs-11 text-cyan" translate>{{ 'calendar.spaces' }}</h3>
     <input class="col-md-1 col-sm-1 col-xs-1" type="checkbox" ng-model="filter.spaces" ng-change="toggleFilter('spaces', filter)">