diff --git a/Riot/Modules/VoiceBroadcast/VoiceBroadcastSDK/VoiceBroadcastAggregator.swift b/Riot/Modules/VoiceBroadcast/VoiceBroadcastSDK/VoiceBroadcastAggregator.swift
index 1a10324d4..6c719bd84 100644
--- a/Riot/Modules/VoiceBroadcast/VoiceBroadcastSDK/VoiceBroadcastAggregator.swift
+++ b/Riot/Modules/VoiceBroadcast/VoiceBroadcastSDK/VoiceBroadcastAggregator.swift
@@ -111,7 +111,7 @@ public class VoiceBroadcastAggregator {
             
             let eventTypes = [VoiceBroadcastSettings.eventType, kMXEventTypeStringRoomMessage]
             self.referenceEventsListener = self.room.listen(toEventsOfTypes: eventTypes) { [weak self] event, direction, state in
-                // TODO: check sender id to block fake voice broadcast chunk
+                // TODO: VB check sender id to block fake voice broadcast chunk
                 guard let self = self,
                       let relatedEventId = event.relatesTo?.eventId,
                       relatedEventId == self.voiceBroadcastStartEventId,
diff --git a/Riot/Modules/VoiceBroadcast/VoiceBroadcastSDK/VoiceBroadcastBuilder.swift b/Riot/Modules/VoiceBroadcast/VoiceBroadcastSDK/VoiceBroadcastBuilder.swift
index df2f60907..187ce02a8 100644
--- a/Riot/Modules/VoiceBroadcast/VoiceBroadcastSDK/VoiceBroadcastBuilder.swift
+++ b/Riot/Modules/VoiceBroadcast/VoiceBroadcastSDK/VoiceBroadcastBuilder.swift
@@ -22,7 +22,7 @@ struct VoiceBroadcastBuilder {
         
         let voiceBroadcast = VoiceBroadcast()
         
-        // TODO: set voice broadcast object
+        // TODO: VB set voice broadcast object
         
         return voiceBroadcast
     }
diff --git a/RiotSwiftUI/Modules/Room/TimelineVoiceBroadcast/Coordinator/TimelineVoiceBroadcastCoordinator.swift b/RiotSwiftUI/Modules/Room/TimelineVoiceBroadcast/Coordinator/TimelineVoiceBroadcastCoordinator.swift
index 30adcfd15..5f20632ac 100644
--- a/RiotSwiftUI/Modules/Room/TimelineVoiceBroadcast/Coordinator/TimelineVoiceBroadcastCoordinator.swift
+++ b/RiotSwiftUI/Modules/Room/TimelineVoiceBroadcast/Coordinator/TimelineVoiceBroadcastCoordinator.swift
@@ -56,8 +56,10 @@ final class TimelineVoiceBroadcastCoordinator: Coordinator, Presentable, VoiceBr
             
             switch result {
             case .played:
+                // TODO: VB Add player and playing chunk files
                 MXLog.debug("click on play")
             case .paused:
+                // TODO: VB stop playing chunk files
                 MXLog.debug("click on pause")
             }
         }
diff --git a/RiotSwiftUI/Modules/Room/TimelineVoiceBroadcast/Service/VoiceBroadcastChunk.swift b/RiotSwiftUI/Modules/Room/TimelineVoiceBroadcast/Service/VoiceBroadcastChunk.swift
index a464997d1..49d8d1a46 100644
--- a/RiotSwiftUI/Modules/Room/TimelineVoiceBroadcast/Service/VoiceBroadcastChunk.swift
+++ b/RiotSwiftUI/Modules/Room/TimelineVoiceBroadcast/Service/VoiceBroadcastChunk.swift
@@ -31,6 +31,6 @@ struct VoiceBroadcastChunk {
     /// Chunk sequence number
     let sequence: UInt
     
-    // TODO: add attachment here
-    let attachment: NSObject
+    // TODO: VB add chunk attachment here
+    let attachmentUrl: URL
 }
diff --git a/RiotSwiftUI/Modules/Room/TimelineVoiceBroadcast/TimelineVoiceBroadcastModels.swift b/RiotSwiftUI/Modules/Room/TimelineVoiceBroadcast/TimelineVoiceBroadcastModels.swift
index b29b1bc7c..d6034038c 100644
--- a/RiotSwiftUI/Modules/Room/TimelineVoiceBroadcast/TimelineVoiceBroadcastModels.swift
+++ b/RiotSwiftUI/Modules/Room/TimelineVoiceBroadcast/TimelineVoiceBroadcastModels.swift
@@ -24,6 +24,7 @@ enum TimelineVoiceBroadcastViewAction {
 }
 
 enum TimelineVoiceBroadcastViewModelResult {
+    // TODO: VB send all chunk file urls from ViewModel
     case played
     case paused
 }