1 files changed, 1 insertions, 2 deletions
diff --git a/src/org/traccar/web/server/model/DataServiceImpl.java b/src/org/traccar/web/server/model/DataServiceImpl.java
index 57357aa8..81130604 100644
--- a/src/org/traccar/web/server/model/DataServiceImpl.java
+++ b/src/org/traccar/web/server/model/DataServiceImpl.java
@@ -167,8 +167,7 @@ public class DataServiceImpl extends RemoteServiceServlet implements DataService
         try {
             device = entityManager.merge(device);
             user.getDevices().remove(device);
-            // If you want to remove device you need to remove all linked positions
-            //entityManager.remove(device);
+            entityManager.remove(device);
             entityManager.getTransaction().commit();
         } catch (RuntimeException e) {
             entityManager.getTransaction().rollback();