diff --git a/Riot/Modules/Rendezvous/RendezvousService.swift b/Riot/Modules/Rendezvous/RendezvousService.swift
index de8f079799..c7bf13bcdc 100644
--- a/Riot/Modules/Rendezvous/RendezvousService.swift
+++ b/Riot/Modules/Rendezvous/RendezvousService.swift
@@ -40,6 +40,10 @@ enum RendezvousFlow: String {
     case SETUP_ADDITIONAL_DEVICE_V2 = "org.matrix.msc3906.setup.additional_device.v2"
 }
 
+// n.b MSC3886/MSC3903/MSC3906 that this is based on are now closed.
+// However, we want to keep this implementation around for some time.
+// TODO: define an end-of-life date for this implementation.
+
 /// Allows communication through a secure channel. Based on MSC3886 and MSC3903
 @MainActor
 class RendezvousService {
diff --git a/RiotSwiftUI/Modules/Authentication/QRLogin/Common/Service/MatrixSDK/QRLoginService.swift b/RiotSwiftUI/Modules/Authentication/QRLogin/Common/Service/MatrixSDK/QRLoginService.swift
index daf2e93f5f..cd645dd94c 100644
--- a/RiotSwiftUI/Modules/Authentication/QRLogin/Common/Service/MatrixSDK/QRLoginService.swift
+++ b/RiotSwiftUI/Modules/Authentication/QRLogin/Common/Service/MatrixSDK/QRLoginService.swift
@@ -23,6 +23,9 @@ import ZXingObjC
 
 // MARK: - QRLoginService
 
+// n.b MSC3886/MSC3903/MSC3906 that this is based on are now closed.
+// However, we want to keep this implementation around for some time.
+// TODO: define an end-of-life date for this implementation.
 class QRLoginService: NSObject, QRLoginServiceProtocol {
     private let client: AuthenticationRestClient
     private let sessionCreator: SessionCreatorProtocol