diff --git a/state-chain/pallets/cf-swapping/src/lib.rs b/state-chain/pallets/cf-swapping/src/lib.rs
index f3d0935ab8..4ee96555e6 100644
--- a/state-chain/pallets/cf-swapping/src/lib.rs
+++ b/state-chain/pallets/cf-swapping/src/lib.rs
@@ -996,6 +996,8 @@ pub mod pallet {
 				Error::<T>::EarnedFeesNotWithdrawn,
 			);
 
+			let _ = AffiliateIdMapping::<T>::clear_prefix(&account_id, u32::MAX, None);
+
 			T::AccountRoleRegistry::deregister_as_broker(&account_id)?;
 
 			Ok(())