1 files changed, 2 insertions, 9 deletions
diff --git a/src/main/java/org/traccar/Context.java b/src/main/java/org/traccar/Context.java
index 62ad01c24..a66cde464 100644
--- a/src/main/java/org/traccar/Context.java
+++ b/src/main/java/org/traccar/Context.java
@@ -78,12 +78,6 @@ public final class Context {
         return deviceManager;
     }
 
-    private static ConnectionManager connectionManager;
-
-    public static ConnectionManager getConnectionManager() {
-        return connectionManager;
-    }
-
     private static PermissionsManager permissionsManager;
 
     public static PermissionsManager getPermissionsManager() {
@@ -114,15 +108,14 @@ public final class Context {
         if (dataManager != null) {
             usersManager = new UsersManager(dataManager);
             groupsManager = new GroupsManager(dataManager);
-            deviceManager = new DeviceManager(dataManager);
+            deviceManager = new DeviceManager(
+                    config, dataManager, Main.getInjector().getInstance(ConnectionManager.class));
         }
 
         identityManager = deviceManager;
 
         permissionsManager = new PermissionsManager(dataManager, usersManager);
 
-        connectionManager = new ConnectionManager();
-
         initEventsModule();
 
     }