diff --git a/www/css/index.css b/www/css/index.css
index fd4e55f..ff5de8d 100644
--- a/www/css/index.css
+++ b/www/css/index.css
@@ -272,10 +272,8 @@ animation-delay: -0.15s;
   color: #888;
 }
 
-#events-empty-spinner-container,
-#events-spinner-container,
-#registrant-spinner-container,
-#registrants-spinner-container {
+#empty-spinner-container,
+#spinner-container {
   display: block;
   position: relative;
   height: 1.4em;
diff --git a/www/js/controllers/registrantController.js b/www/js/controllers/registrantController.js
index ae0b20c..0eb6bfa 100644
--- a/www/js/controllers/registrantController.js
+++ b/www/js/controllers/registrantController.js
@@ -6,7 +6,7 @@ angular.module('Checkinapp.registrantController', []).controller('RegistrantCont
   function ($scope, $location, Storage, IndicoApi) {
     const spinner = new Spinner({lines: 8, length: 4, width: 3, radius: 3, color: '#464646', speed: 0.7}).spin();
     $scope.loading = true;
-    document.getElementById('registrant-spinner-container').appendChild(spinner.el);
+    document.getElementById('spinner-container').appendChild(spinner.el);
 
     async function doCheckin(server, eventId, registrantId, value = true) {
       let result = await IndicoApi.doCheckin(server, eventId, registrantId, value);
diff --git a/www/js/controllers/registrantsController.js b/www/js/controllers/registrantsController.js
index 7036e88..70d046c 100644
--- a/www/js/controllers/registrantsController.js
+++ b/www/js/controllers/registrantsController.js
@@ -19,7 +19,7 @@ angular.module('Checkinapp.registrantsController', []).controller('RegistrantsCo
       const spinner = new Spinner({lines: 8, length: 4, width: 3, radius: 3, color: '#464646', speed: 0.7}).spin();
       $scope.loading = true;
 
-      document.getElementById('registrants-spinner-container').appendChild(spinner.el);
+      document.getElementById('spinner-container').appendChild(spinner.el);
 
       try {
         let result = await IndicoApi.getRegistrants(server, eventId);
diff --git a/www/partials/events.html b/www/partials/events.html
index a819a40..4485b1c 100644
--- a/www/partials/events.html
+++ b/www/partials/events.html
@@ -6,11 +6,11 @@ <h3>
         <div>No events</div>
         <small>Please click in 'Add event' if you want to start the check-in process</small>
       </h3>
-      <div ng-show="loading" id="events-empty-spinner-container" class="spinner-center"></div>
+      <div ng-show="loading" id="empty-spinner-container" class="spinner-center"></div>
     </div>
     <div ng-hide="isEventListEmpty()" class="panel panel-default">
       <div class="panel-heading">
-        <div ng-show="loading" id="events-spinner-container" class="pull-right"></div>
+        <div ng-show="loading" id="spinner-container" class="pull-right"></div>
         <div ng-hide="loading" class="pull-right">
           <button type="button" class="btn btn-primary btn-sm" ng-click="editMode=true" ng-show="!editMode">
             <span class="glyphicon glyphicon-edit"></span>
diff --git a/www/partials/registrant.html b/www/partials/registrant.html
index 1477090..0421281 100644
--- a/www/partials/registrant.html
+++ b/www/partials/registrant.html
@@ -3,7 +3,7 @@
     <div class="panel panel-default">
       <div class="panel-heading">
         <h3 class="panel-title">
-          <div ng-show="loading" id="registrant-spinner-container" class="pull-right"></div>
+          <div ng-show="loading" id="spinner-container" class="pull-right"></div>
           <div ng-show="registrant.full_name">{{registrant.full_name}}</div>
           <div ng-show="!registrant.full_name">Attendee</div>
           <small>
diff --git a/www/partials/registrants.html b/www/partials/registrants.html
index 7509d7b..a2824d2 100644
--- a/www/partials/registrants.html
+++ b/www/partials/registrants.html
@@ -5,10 +5,11 @@
       <h3>
         <div>No attendees</div>
       </h3>
+      <div ng-show="loading" id="empty-spinner-container" class="spinner-center"></div>
     </div>
     <div ng-hide="isRegistrantListEmpty()" id="registrants-list-container" class="panel panel-default">
       <div class="panel-heading">
-        <div ng-show="loading" id="registrants-spinner-container" class="pull-right"></div>
+        <div ng-show="loading" id="spinner-container" class="pull-right"></div>
         <div ng-hide="loading" class="pull-right badge bg-blue">{{totalCount}}</div>
         <h3 class="panel-title">Attendees</h3>
       </div>