1 files changed, 6 insertions, 0 deletions
diff --git a/src/org/traccar/Main.java b/src/org/traccar/Main.java
index 1e2db2693..0d7c2ecf0 100644
--- a/src/org/traccar/Main.java
+++ b/src/org/traccar/Main.java
@@ -15,9 +15,11 @@
  */
 package org.traccar;
 
+import org.traccar.flespi.FlespiClient;
 import org.traccar.helper.Log;
 
 import java.sql.SQLException;
+import java.util.List;
 import java.util.Timer;
 import java.util.TimerTask;
 import java.util.Locale;
@@ -56,6 +58,10 @@ public final class Main {
             public void run() {
                 Log.info("Shutting down server...");
 
+                List<FlespiClient> flespiClients = Context.getFlespiClients();
+                for (FlespiClient flespiClient : flespiClients) {
+                    flespiClient.stopPullTask();
+                }
                 if (Context.getWebServer() != null) {
                     Context.getWebServer().stop();
                 }