diff --git a/SCTE35Plugin/src/main/java/io/antmedia/plugin/SCTE35Plugin.java b/SCTE35Plugin/src/main/java/io/antmedia/plugin/SCTE35Plugin.java
index 7fa53753..dd43867b 100644
--- a/SCTE35Plugin/src/main/java/io/antmedia/plugin/SCTE35Plugin.java
+++ b/SCTE35Plugin/src/main/java/io/antmedia/plugin/SCTE35Plugin.java
@@ -112,7 +112,8 @@ public AntMediaApplicationAdapter getApplication() {
     }
 
     @Override
-    public void streamStarted(String streamId) {
+    public void streamStarted(Broadcast broadcast) {
+        String streamId = broadcast.getStreamId();
         logger.info("Stream started: {} - Adding SCTE-35 packet listener", streamId);
         
         IAntMediaStreamHandler app = getApplication();
@@ -132,7 +133,6 @@ public void streamStarted(String streamId) {
             return;
         }
 
-        Broadcast broadcast = dataStore.get(streamId);
         List<EncoderSettings> encoderSettingsList = null;
 
         if (broadcast != null) {
@@ -208,9 +208,10 @@ public void streamStarted(String streamId) {
     }
 
     @Override
-    public void streamFinished(String streamId) {
+    public void streamFinished(Broadcast broadcast) {
+        String streamId = broadcast.getStreamId();
         logger.info("Stream finished: {} - Removing SCTE-35 packet listener", streamId);
-        
+
         SCTE35PacketListener scte35Listener = scte35ListenerMap.remove(streamId);
         if (scte35Listener != null) {
             getApplication().removePacketListener(streamId, scte35Listener);