diff --git a/SessionCompanion/SessionCompanion.Services/Services/CharacterWeaponService.cs b/SessionCompanion/SessionCompanion.Services/Services/CharacterWeaponService.cs
index cc840e0..01addda 100644
--- a/SessionCompanion/SessionCompanion.Services/Services/CharacterWeaponService.cs
+++ b/SessionCompanion/SessionCompanion.Services/Services/CharacterWeaponService.cs
@@ -36,9 +36,12 @@ namespace SessionCompanion.Services.Services
         public async Task<Either<SuccessResponse,ErrorResponse>> ChangeCharacterWeapon(CharacterWeaponViewModel model)
         {
             // Dodaj optional rozbro postac
-            var weaponsInUse = await Repository.Get(c => c.CharacterId.Equals(model.CharacterId)).Where(w => w.InUse.Equals(true)).ToListAsync();
-            
+            var allWeapons = await Repository.Get(c => c.CharacterId.Equals(model.CharacterId)).AsNoTracking().ToListAsync();
+            //var weaponsInUse = await Repository.Get(c => c.CharacterId.Equals(model.CharacterId)).Where(w => w.InUse.Equals(true)).ToListAsync();
+            var weaponsInUse = allWeapons.Where(w => w.InUse.Equals(true)).ToList();
+
             var weapon = Mapper.Map<CharacterWeapon>(model);
+            weapon.Id = allWeapons.Where(w => w.WeaponId.Equals(model.WeaponId)).Select(x => x.Id).FirstOrDefault();
 
             if (weaponsInUse.Count() == 0)
             {