2 files changed, 21 insertions, 2 deletions
diff --git a/src/main/java/org/traccar/session/state/MotionProcessor.java b/src/main/java/org/traccar/session/state/MotionProcessor.java
index b9d706492..a1737a739 100644
--- a/src/main/java/org/traccar/session/state/MotionProcessor.java
+++ b/src/main/java/org/traccar/session/state/MotionProcessor.java
@@ -59,6 +59,7 @@ public final class MotionProcessor {
                     String eventType = newState ? Event.TYPE_DEVICE_MOVING : Event.TYPE_DEVICE_STOPPED;
                     Event event = new Event(eventType, position);
 
+                    state.setMotionStreak(newState);
                     state.setMotionTime(null);
                     state.setMotionDistance(0);
                     state.setEvent(event);
@@ -67,8 +68,13 @@ public final class MotionProcessor {
             }
         } else {
             state.setMotionState(newState);
-            state.setMotionTime(position.getFixTime());
-            state.setMotionDistance(position.getDouble(Position.KEY_TOTAL_DISTANCE));
+            if (state.getMotionStreak() == newState) {
+                state.setMotionTime(null);
+                state.setMotionDistance(0);
+            } else {
+                state.setMotionTime(position.getFixTime());
+                state.setMotionDistance(position.getDouble(Position.KEY_TOTAL_DISTANCE));
+            }
         }
     }
 
diff --git a/src/main/java/org/traccar/session/state/MotionState.java b/src/main/java/org/traccar/session/state/MotionState.java
index e3ce58ab2..6c917ad16 100644
--- a/src/main/java/org/traccar/session/state/MotionState.java
+++ b/src/main/java/org/traccar/session/state/MotionState.java
@@ -24,6 +24,7 @@ public class MotionState {
 
     public static MotionState fromDevice(Device device) {
         MotionState state = new MotionState();
+        state.motionStreak = device.getMotionStreak();
         state.motionState = device.getMotionState();
         state.motionTime = device.getMotionTime();
         state.motionDistance = device.getMotionDistance();
@@ -31,6 +32,7 @@ public class MotionState {
     }
 
     public void toDevice(Device device) {
+        device.setMotionStreak(motionStreak);
         device.setMotionState(motionState);
         device.setMotionTime(motionTime);
         device.setMotionDistance(motionDistance);
@@ -42,6 +44,17 @@ public class MotionState {
         return changed;
     }
 
+    private boolean motionStreak;
+
+    public boolean getMotionStreak() {
+        return motionStreak;
+    }
+
+    public void setMotionStreak(boolean motionStreak) {
+        this.motionStreak = motionStreak;
+        changed = true;
+    }
+
     private boolean motionState;
 
     public boolean getMotionState() {