diff --git a/app/models/disbursement/incoming.rb b/app/models/disbursement/incoming.rb
index 9e4259baf1..d1d3dea30b 100644
--- a/app/models/disbursement/incoming.rb
+++ b/app/models/disbursement/incoming.rb
@@ -70,13 +70,12 @@ def counterparty
     alias_method :counterparty_subledger, :source_subledger
     alias_method :transaction_category, :destination_transaction_category
 
-    # These need to be updated later to not use HCB code
     def canonical_transactions
-      @canonical_transactions ||= CanonicalTransaction.where(hcb_code: incoming_hcb_code)
+      @canonical_transactions ||= CanonicalTransaction.where(ledger_item: Ledger::Item.find_by(linked_object: self))
     end
 
     def canonical_pending_transactions
-      @canonical_pending_transactions ||= ::CanonicalPendingTransaction.where(hcb_code: incoming_hcb_code)
+      @canonical_pending_transactions ||= ::CanonicalPendingTransaction.where(ledger_item: Ledger::Item.find_by(linked_object: self))
     end
 
   end
diff --git a/app/models/disbursement/outgoing.rb b/app/models/disbursement/outgoing.rb
index fe10b2f210..c875e94bbe 100644
--- a/app/models/disbursement/outgoing.rb
+++ b/app/models/disbursement/outgoing.rb
@@ -74,13 +74,12 @@ def counterparty
     alias_method :counterparty_subledger, :destination_subledger
     alias_method :transaction_category, :source_transaction_category
 
-    # These need to be updated later to not use HCB code
     def canonical_transactions
-      @canonical_transactions ||= CanonicalTransaction.where(hcb_code: outgoing_hcb_code)
+      @canonical_transactions ||= CanonicalTransaction.where(ledger_item: Ledger::Item.find_by(linked_object: self))
     end
 
     def canonical_pending_transactions
-      @canonical_pending_transactions ||= ::CanonicalPendingTransaction.where(hcb_code: outgoing_hcb_code)
+      @canonical_pending_transactions ||= ::CanonicalPendingTransaction.where(ledger_item: Ledger::Item.find_by(linked_object: self))
     end
 
   end