diff --git a/src/main/java/im/rosetta/executors/Executor16PushNotification.java b/src/main/java/im/rosetta/executors/Executor16PushNotification.java
index 7aa55b0..c4bccbc 100644
--- a/src/main/java/im/rosetta/executors/Executor16PushNotification.java
+++ b/src/main/java/im/rosetta/executors/Executor16PushNotification.java
@@ -58,15 +58,13 @@ public class Executor16PushNotification extends PacketExecutor<Packet16PushNotif
             token.setToken(notificationToken);
             token.setDevice(device);
             token.setType(packet.getTokenType());
-            device.addToken(token);
-            this.deviceRepository.save(device);
+            this.pushTokenRepository.save(token);
         }
         if(packet.getAction() == NetworkNotificationAction.UNSUBSCRIBE && pushToken != null){
             /**
              * Отписка от токена только если токен уже подписан
              */
-            device.removeToken(pushToken);
-            this.deviceRepository.save(device);
+            this.pushTokenRepository.delete(pushToken);
         }
     }