diff --git a/Sources/epoch_code/compile/traders/EPOCH_NPCTraderMenuFilter.sqf b/Sources/epoch_code/compile/traders/EPOCH_NPCTraderMenuFilter.sqf
index 9730b4c2..865931ea 100644
--- a/Sources/epoch_code/compile/traders/EPOCH_NPCTraderMenuFilter.sqf
+++ b/Sources/epoch_code/compile/traders/EPOCH_NPCTraderMenuFilter.sqf
@@ -24,11 +24,34 @@ _PlayerItemsBox = 41500;
 _PlayerItemsOutBox = 41501;
 _TraderItemsBox = 41503;
 _TraderItemsOutBox = 41502;
+_isPlayerFilter = (ctrlIDC _control == _PlayerFilerDropDown);
+_LbText = _control lbText _index;
 
 _config = 'CfgItemSort' call EPOCH_returnConfig;
 _MainCategoriearray = getarray (_config >> "MainCategories" >> "Classes");
 _FilterArray = [];
 if (_index != 0) then {
+	if (!_isPlayerFilter && _LbText in 
+		[
+			format ["Fits %1",(primaryweapon player) call EPOCH_itemDisplayName],
+			format ["Fits %1",(secondaryweapon player) call EPOCH_itemDisplayName],
+			format ["Fits %1",(handgunweapon player) call EPOCH_itemDisplayName]
+		]
+	) exitwith {
+		_CheckWpnClass = switch _LbText do {
+			case (format ["Fits %1",(primaryweapon player) call EPOCH_itemDisplayName]) : {primaryweapon player};
+			case (format ["Fits %1",(secondaryweapon player) call EPOCH_itemDisplayName]) : {secondaryweapon player};
+			case (format ["Fits %1",(handgunweapon player) call EPOCH_itemDisplayName]) : {handgunweapon player};
+		};
+		_possiblemags = getarray (configfile >> "CfgWeapons" >> _CheckWpnClass >> "magazines");
+		_possibleMuzzles = getarray (configfile >> "CfgWeapons" >> _CheckWpnClass >> "WeaponSlotsInfo" >> "MuzzleSlot" >> "compatibleItems");
+		_possibleScopes = getarray (configfile >> "CfgWeapons" >> _CheckWpnClass >> "WeaponSlotsInfo" >> "CowsSlot" >> "compatibleItems");
+		_possiblePointers = getarray (configfile >> "CfgWeapons" >> _CheckWpnClass >> "WeaponSlotsInfo" >> "PointerSlot" >> "compatibleItems");
+		_possibleUnderBarrel = getarray (configfile >> "CfgWeapons" >> _CheckWpnClass >> "WeaponSlotsInfo" >> "UnderBarrelSlot" >> "compatibleItems");
+		{
+			_FilterArray pushback (tolower _x);
+		} foreach (_possiblemags + _possibleMuzzles + _possibleScopes + _possiblePointers + _possibleUnderBarrel);
+	};
 	{
 		_MainCategorie = _x;
 		if (_index == (_MainCategorie select 0)) then {
@@ -45,7 +68,6 @@ if (_index != 0) then {
 if !(isNull EPOCH_lastNPCtradeTarget) then {
 	_slot = EPOCH_lastNPCtradeTarget getVariable["AI_SLOT", -1];
 	if (_slot != -1) then {
-		_isPlayerFilter = (ctrlIDC _control == _PlayerFilerDropDown);
 		if (_isPlayerFilter) then {
 			lbClear _PlayerItemsBox;
 			{
diff --git a/Sources/epoch_code/compile/traders/EPOCH_startNPCTraderMenu.sqf b/Sources/epoch_code/compile/traders/EPOCH_startNPCTraderMenu.sqf
index 6fa3bdfe..aaa7fdcc 100644
--- a/Sources/epoch_code/compile/traders/EPOCH_startNPCTraderMenu.sqf
+++ b/Sources/epoch_code/compile/traders/EPOCH_startNPCTraderMenu.sqf
@@ -51,6 +51,18 @@ if (alive _target) then {
 			lbAdd [42100,_categorie];
 			lbAdd [42101,_categorie]
 		} forEach _MainCategoriearray;
+		if !(primaryweapon player isEqualTo "") then {
+			_idx = lbAdd [42101,format ["Fits %1",(primaryweapon player) call EPOCH_itemDisplayName]];
+			lbSetColor [42101, _idx, [1, 1, 0, 1]];
+		};
+		if !(secondaryweapon player isEqualTo "") then {
+			_idx = lbAdd [42101,format ["Fits %1",(secondaryweapon player) call EPOCH_itemDisplayName]];
+			lbSetColor [42101, _idx, [1, 1, 0, 1]];
+		};
+		if !(handgunweapon player isEqualTo "") then {
+			_idx = lbAdd [42101,format ["Fits %1",(handgunweapon player) call EPOCH_itemDisplayName]];
+			lbSetColor [42101, _idx, [1, 1, 0, 1]];
+		};
 		lbSetCurSel [42100, 0];
 		lbSetCurSel [42101, 0];
 	};
diff --git a/changelog.md b/changelog.md
index f04108d6..2723783b 100644
--- a/changelog.md
+++ b/changelog.md
@@ -6,6 +6,7 @@ All changes for [Arma 3](https://arma3.com/) [Epoch Mod](https://epochmod.com) a
 - Clear message that the server is not fully loaded when Players login to early
 - Optional Black Market Traders
 - Build in RyanZ Zombiespawner (when RyanZ is enabled on the Server)
+- Trader Filter for useable items on currently equipped weapons
 
 ### Fixed
 - On farming wracks / cinder, sometimes the more far away object was looted instead of the nearest