1 files changed, 6 insertions, 2 deletions
diff --git a/src/org/traccar/Context.java b/src/org/traccar/Context.java
index f40db72e5..b37e87331 100644
--- a/src/org/traccar/Context.java
+++ b/src/org/traccar/Context.java
@@ -193,9 +193,13 @@ public final class Context {
 
         connectionManager = new ConnectionManager(dataManager);
 
-        geofenceManager = new GeofenceManager(dataManager);
+        if (config.getBoolean("event.geofenceHandler")) {
+            geofenceManager = new GeofenceManager(dataManager);
+        }
 
-        notificationManager = new NotificationManager(dataManager);
+        if (config.getBoolean("event.enable")) {
+            notificationManager = new NotificationManager(dataManager);
+        }
 
         serverManager = new ServerManager();