1 files changed, 2 insertions, 1 deletions
diff --git a/src/org/traccar/database/ConnectionManager.java b/src/org/traccar/database/ConnectionManager.java
index ec5903548..6e47dfad3 100644
--- a/src/org/traccar/database/ConnectionManager.java
+++ b/src/org/traccar/database/ConnectionManager.java
@@ -155,7 +155,8 @@ public class ConnectionManager {
             Log.warning(error);
         }
         for (long userId : Context.getPermissionsManager().getDeviceUsers(deviceId)) {
-            if (listeners.containsKey(userId)) {
+            if (listeners.containsKey(userId) && (event.getGeofenceId() == 0
+                    || Context.getGeofenceManager().checkGeofence(userId, event.getGeofenceId()))) {
                 for (UpdateListener listener : listeners.get(userId)) {
                     listener.onUpdateEvent(event, position);
                 }