diff --git a/Content/Blueprints/Game/BP_Cloud9GameInstance.uasset b/Content/Blueprints/Game/BP_Cloud9GameInstance.uasset
index fa4fe1199..982b3f99f 100644
Binary files a/Content/Blueprints/Game/BP_Cloud9GameInstance.uasset and b/Content/Blueprints/Game/BP_Cloud9GameInstance.uasset differ
diff --git a/Content/Blueprints/Weapons/FirearmWeaponsTable.uasset b/Content/Blueprints/Weapons/FirearmWeaponsTable.uasset
index 1143f8c3c..5094a3706 100644
Binary files a/Content/Blueprints/Weapons/FirearmWeaponsTable.uasset and b/Content/Blueprints/Weapons/FirearmWeaponsTable.uasset differ
diff --git a/Content/Blueprints/Weapons/WeaponTableDefinitions.uasset b/Content/Blueprints/Weapons/WeaponTableDefinitions.uasset
index b07d1a62a..c98f51860 100644
Binary files a/Content/Blueprints/Weapons/WeaponTableDefinitions.uasset and b/Content/Blueprints/Weapons/WeaponTableDefinitions.uasset differ
diff --git a/Content/Blueprints/Widgets/HudWidget.uasset b/Content/Blueprints/Widgets/HudWidget.uasset
index 80c80adba..2b36efd53 100644
Binary files a/Content/Blueprints/Widgets/HudWidget.uasset and b/Content/Blueprints/Widgets/HudWidget.uasset differ
diff --git a/Content/Blueprints/Widgets/InventoryRow.uasset b/Content/Blueprints/Widgets/InventoryRow.uasset
index 88b01d5b8..a5e7189c5 100644
Binary files a/Content/Blueprints/Widgets/InventoryRow.uasset and b/Content/Blueprints/Widgets/InventoryRow.uasset differ
diff --git a/Content/Blueprints/Widgets/InventoryWidget.uasset b/Content/Blueprints/Widgets/InventoryWidget.uasset
index 93d0e7e86..cb8ed49b4 100644
Binary files a/Content/Blueprints/Widgets/InventoryWidget.uasset and b/Content/Blueprints/Widgets/InventoryWidget.uasset differ
diff --git a/Source/Cloud9/Character/Cloud9Character.cpp b/Source/Cloud9/Character/Cloud9Character.cpp
index f10ed3660..ee3f4b4e5 100644
--- a/Source/Cloud9/Character/Cloud9Character.cpp
+++ b/Source/Cloud9/Character/Cloud9Character.cpp
@@ -274,14 +274,14 @@ void ACloud9Character::Tick(float DeltaSeconds)
 		Inventory->SelectOtherAvailableWeapon(false);
 	}
 
-	// TODO: Remove auto grenade add after debug
-	if (not Inventory->GetWeaponAt(EWeaponSlot::Grenade) and Inventory->GetSelectedWeapon() != nullptr)
-	{
-		if (let GameInstance = GetGameInstance<UCloud9GameInstance>(); IsValid(GameInstance))
-		{
-			GameInstance->GetDefaultWeaponsConfig()
-				| ETContainer::Filter{[this](let& Config) { return IsValid(Config) and Config.IsGrenadeWeapon(); }}
-				| ETContainer::ForEach{[this](let& Config) { Inventory->AddWeapon(Config); }};
-		}
-	}
+	// // TODO: Remove auto grenade add after debug
+	// if (not Inventory->GetWeaponAt(EWeaponSlot::Grenade) and Inventory->GetSelectedWeapon() != nullptr)
+	// {
+	// 	if (let GameInstance = GetGameInstance<UCloud9GameInstance>(); IsValid(GameInstance))
+	// 	{
+	// 		GameInstance->GetDefaultWeaponsConfig()
+	// 			| ETContainer::Filter{[this](let& Config) { return IsValid(Config) and Config.IsGrenadeWeapon(); }}
+	// 			| ETContainer::ForEach{[this](let& Config) { Inventory->AddWeapon(Config); }};
+	// 	}
+	// }
 }
diff --git a/Source/Cloud9/Weapon/Notifiers/Cloud9AnimNotifyPlaySound.cpp b/Source/Cloud9/Weapon/Notifiers/Cloud9AnimNotifyPlaySound.cpp
index 2bb74730e..3540c3ee6 100644
--- a/Source/Cloud9/Weapon/Notifiers/Cloud9AnimNotifyPlaySound.cpp
+++ b/Source/Cloud9/Weapon/Notifiers/Cloud9AnimNotifyPlaySound.cpp
@@ -85,13 +85,14 @@ bool UCloud9AnimNotifyPlaySound::PlayFirearmSound(USkeletalMeshComponent* MeshCo
 	case EWeaponSoundType::Secondary:
 		return UCloud9SoundPlayer::PlaySoundByName(WeaponInfo->Sounds.ZoomSounds, Name, Location, Volume);
 	case EWeaponSoundType::LowAmmo:
-		if (SelectedWeapon->GetCurrentAmmo() < WeaponInfo->LowAmmoCount)
+		if (SelectedWeapon->GetCurrentAmmo() <= WeaponInfo->LowAmmoCount)
 		{
 			let LowAmmoVolume = CommonData->Firearm.LowAmmoVolumeMultiplier * Volume;
-			return UCloud9SoundPlayer::PlaySingleSound(CommonData->Firearm.LowAmmo, Location, LowAmmoVolume);
+			return UCloud9SoundPlayer::PlaySingleSound(CommonData->Firearm.LowAmmoSound, Location, LowAmmoVolume);
 		}
+		return false;
 	default:
-		log(Error, "[Notify='%s'] Invalid sound type for firearm sound", *GetName());
+		log(Error, "[Notify='%s'] Invalid sound type for firearm sound SoundType=%d", *GetName(), SoundType);
 		return false;
 	}
 }
@@ -119,7 +120,7 @@ bool UCloud9AnimNotifyPlaySound::PlayGrenadeSound(USkeletalMeshComponent* MeshCo
 	case EWeaponSoundType::Primary:
 		return UCloud9SoundPlayer::PlaySingleSound(WeaponInfo->Sounds.ThrowSound, Location, Volume);
 	default:
-		log(Error, "[Notify='%s'] Invalid sound type for firearm sound", *GetName());
+		log(Error, "[Notify='%s'] Invalid sound type for firearm sound SoundType=%d", *GetName(), SoundType);
 		return false;
 	}
 }
diff --git a/Source/Cloud9/Weapon/Tables/WeaponCommonData.h b/Source/Cloud9/Weapon/Tables/WeaponCommonData.h
index 377627be4..e272633d9 100644
--- a/Source/Cloud9/Weapon/Tables/WeaponCommonData.h
+++ b/Source/Cloud9/Weapon/Tables/WeaponCommonData.h
@@ -53,7 +53,7 @@ struct FFirearmCommonData
 	UNiagaraSystem* Squib;
 
 	UPROPERTY(BlueprintReadOnly, EditDefaultsOnly, Category=Sound)
-	USoundBase* LowAmmo;
+	USoundBase* LowAmmoSound;
 
 	UPROPERTY(BlueprintReadOnly, EditDefaultsOnly, Category=Sound)
 	float LowAmmoVolumeMultiplier = 2.0f;