diff --git a/apps/shared-modules/hms-video/components/hms-video/conference/conference-user-videos/conference-user-video/conference-user-video.component.html b/apps/shared-modules/hms-video/components/hms-video/conference/conference-user-videos/conference-user-video/conference-user-video.component.html
index 200534441..6580961a8 100644
--- a/apps/shared-modules/hms-video/components/hms-video/conference/conference-user-videos/conference-user-video/conference-user-video.component.html
+++ b/apps/shared-modules/hms-video/components/hms-video/conference/conference-user-videos/conference-user-video/conference-user-video.component.html
@@ -78,7 +78,12 @@
     </a>
     <!-- button to follow speaker -->
     <div class="com-ml-2">
-      <app-user-follow [username]="metaData.username" appearance="outline" status="basic"></app-user-follow>
+      <app-user-follow
+        [username]="metaData.username"
+        [userId]="metaData.id"
+        appearance="outline"
+        status="basic"
+      ></app-user-follow>
     </div>
   </div>
 </div>
diff --git a/apps/shared-modules/hms-video/components/hms-video/conference/conference.component.html b/apps/shared-modules/hms-video/components/hms-video/conference/conference.component.html
index 3e8f51ef2..18551391d 100644
--- a/apps/shared-modules/hms-video/components/hms-video/conference/conference.component.html
+++ b/apps/shared-modules/hms-video/components/hms-video/conference/conference.component.html
@@ -20,7 +20,7 @@
       (click)="toggleStreaming()"
       *ngIf="
         (localPeer.roleName === EHmsRoles.HOST || localPeer.roleName === EHmsRoles.HOST_VIEWER) &&
-        embeddedVideoStream?.rtmp_url.length > 0
+        embeddedVideoStream?.rtmp_url?.length > 0
       "
       [nbTooltip]="isStreaming ? 'Stop Streaming' : 'Start Streaming'"
       ghost