4 files changed, 4 insertions, 9 deletions
diff --git a/web/app/controller/Root.js b/web/app/controller/Root.js
index 8ae348ca4..56a076edd 100644
--- a/web/app/controller/Root.js
+++ b/web/app/controller/Root.js
@@ -75,11 +75,6 @@ Ext.define('Traccar.controller.Root', {
     loadApp: function () {
         Ext.getStore('Groups').load();
         Ext.getStore('Devices').load();
-        Ext.getStore('Geofences').getProxy().on('exception', function(proxy, response, operation) {
-            if (operation && operation.error.status === 404) {
-                Traccar.app.withoutGeofences = true;
-            }
-        });
         Ext.getStore('Geofences').load();
         Ext.get('attribution').remove();
         if (this.isPhone) {
@@ -153,7 +148,7 @@ Ext.define('Traccar.controller.Root', {
                             text = typeKey;
                         }
                     }
-                    if (array[i].geofenceId !== 0 && !Traccar.app.withoutGeofences) {
+                    if (array[i].geofenceId !== 0) {
                         geofence = Ext.getStore('Geofences').getById(array[i].geofenceId);
                         if (typeof geofence != "undefined") {
                             text += ' \"' + geofence.getData().name + '"';
diff --git a/web/app/view/DevicesController.js b/web/app/view/DevicesController.js
index 8b35fd859..cf31dd7bb 100644
--- a/web/app/view/DevicesController.js
+++ b/web/app/view/DevicesController.js
@@ -125,7 +125,7 @@ Ext.define('Traccar.view.DevicesController', {
         var empty = selected.getCount() === 0;
         this.lookupReference('toolbarEditButton').setDisabled(empty);
         this.lookupReference('toolbarRemoveButton').setDisabled(empty);
-        this.lookupReference('toolbarGeofencesButton').setDisabled(empty || Traccar.app.withoutGeofences);
+        this.lookupReference('toolbarGeofencesButton').setDisabled(empty);
         this.lookupReference('deviceCommandButton').setDisabled(empty || (selected.getLastSelected().get('status') !== 'online'));
         if (!empty) {
             this.fireEvent('selectDevice', selected.getLastSelected(), true);
diff --git a/web/app/view/GroupsController.js b/web/app/view/GroupsController.js
index ecacdb7f6..bc713bb6d 100644
--- a/web/app/view/GroupsController.js
+++ b/web/app/view/GroupsController.js
@@ -79,6 +79,6 @@ Ext.define('Traccar.view.GroupsController', {
         var disabled = selected.length > 0;
         this.lookupReference('toolbarEditButton').setDisabled(disabled);
         this.lookupReference('toolbarRemoveButton').setDisabled(disabled);
-        this.lookupReference('toolbarGeofencesButton').setDisabled(disabled || Traccar.app.withoutGeofences);
+        this.lookupReference('toolbarGeofencesButton').setDisabled(disabled);
     }
 });
diff --git a/web/app/view/UsersController.js b/web/app/view/UsersController.js
index d8e42570d..acba66b4d 100644
--- a/web/app/view/UsersController.js
+++ b/web/app/view/UsersController.js
@@ -120,6 +120,6 @@ Ext.define('Traccar.view.UsersController', {
         this.lookupReference('toolbarRemoveButton').setDisabled(disabled);
         this.lookupReference('userDevicesButton').setDisabled(disabled);
         this.lookupReference('userGroupsButton').setDisabled(disabled);
-        this.lookupReference('userGeofencesButton').setDisabled(disabled || Traccar.app.withoutGeofences);
+        this.lookupReference('userGeofencesButton').setDisabled(disabled);
     }
 });