diff --git a/src/main.ts b/src/main.ts
index a2be273..b0096df 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -24,7 +24,7 @@ const dummyData = {
   host: 1
 }
 
-setInterval(() => registerWebSocketKill(dummyData), 100)
+// setInterval(() => registerWebSocketKill(dummyData), 100)
 
 type websocketData = {
   attacker_id: string,
diff --git a/src/stores/kill.ts b/src/stores/kill.ts
index 3388edd..248ae5b 100644
--- a/src/stores/kill.ts
+++ b/src/stores/kill.ts
@@ -241,16 +241,16 @@ export const useKillStore = defineStore('kill', {
       return this.nsServers || []
     },
     setFilter (filter:Filters) {
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
+      const { player: _player, ...withoutPlayers } = filter
+      if (this.currentFilter.player === _player) { this.fetchPlayers(withoutPlayers) }
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
+      const { weapon: _weapon, ...withoutWeapon } = filter
+      if (this.currentFilter.weapon === _weapon) { this.fetchWeapons(withoutWeapon) }
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
+      const { server: _server, ...withoutServer } = filter
+      // if (this.currentFilter.server === _server) { this.fetchServers(withoutServer) }
       this.currentFilter = filter
-      // eslint-disable-next-line @typescript-eslint/no-unused-vars
-      const { player: _player, ...withoutPlayers } = this.currentFilter
-      this.fetchPlayers(withoutPlayers)
-      // eslint-disable-next-line @typescript-eslint/no-unused-vars
-      const { weapon: _weapon, ...withoutWeapon } = this.currentFilter
-      this.fetchWeapons(withoutWeapon)
-      // eslint-disable-next-line @typescript-eslint/no-unused-vars
-      const { server: _server, ...withoutServer } = this.currentFilter
-      this.fetchWeapons(withoutServer)
     }
   }
 })
diff --git a/src/views/PlayerView.vue b/src/views/PlayerView.vue
index 316bd3f..9107ad1 100644
--- a/src/views/PlayerView.vue
+++ b/src/views/PlayerView.vue
@@ -195,7 +195,7 @@ export default defineComponent({
       // eslint-disable-next-line @typescript-eslint/no-unused-vars
       const { player: _, ...withoutPlayer } = this.$route.query
       router.push({ query: { player: newValue?.id, ...withoutPlayer } })// .then(e => { console.log(e) })
-      this.store.setFilter({ player: newValue?.id, ...this.store.currentFilter })
+      this.store.setFilter({ ...this.store.currentFilter, player: newValue?.id })
     },
     $route: {
       handler: function () {