diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs
index ef9c4e1f..05e17895 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs	
@@ -484,6 +484,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
             codec.Participants.ParticipantsListHasChanged += (sender, args) =>
             {
                 string participantsXSig;
+
                 if (codec.Participants.CurrentParticipants.Count == 0)
                 {
                     participantsXSig = Encoding.GetEncoding(XSigEncoding).GetString(_clearBytes, 0, _clearBytes.Length);
@@ -492,10 +493,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
                     return;
                 }
 
-                participantsXSig = Encoding.GetEncoding(XSigEncoding).GetString(_clearBytes, 0, _clearBytes.Length);
-
-                trilist.SetString(joinMap.CurrentParticipants.JoinNumber, participantsXSig);
-
                 participantsXSig = UpdateParticipantsXSig(codec.Participants.CurrentParticipants);
 
                 trilist.SetString(joinMap.CurrentParticipants.JoinNumber, participantsXSig);
@@ -518,7 +515,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 
             foreach (var participant in currentParticipants)
             {
-                if (meetingIndex > maxParticipants * offset) break;
+                if (meetingIndex >= maxParticipants * offset) break;
 
                 //digitals
                 tokenArray[digitalIndex] = new XSigDigitalToken(digitalIndex + 1, participant.AudioMuteFb);
@@ -534,6 +531,22 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
                 meetingIndex += offset;
                 stringIndex += maxStrings;
             }
+
+            while (meetingIndex < maxParticipants*offset)
+            {
+                tokenArray[digitalIndex] = new XSigDigitalToken(digitalIndex + 1, false);
+                tokenArray[digitalIndex + 1] = new XSigDigitalToken(digitalIndex + 2, false);
+                tokenArray[digitalIndex + 2] = new XSigDigitalToken(digitalIndex + 3, false);
+                tokenArray[digitalIndex + 3] = new XSigDigitalToken(digitalIndex + 4, false);
+                tokenArray[digitalIndex + 4] = new XSigDigitalToken(digitalIndex + 5, false);
+
+                //serials
+                tokenArray[stringIndex] = new XSigSerialToken(stringIndex + 1, String.Empty);
+
+                digitalIndex += maxDigitals;
+                meetingIndex += offset;
+                stringIndex += maxStrings;
+            }
             
             return GetXSigString(tokenArray);
         }
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs
index 6cb62a34..e6cc3fc2 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs	
@@ -399,6 +399,26 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
             SetIsReady();
         }
 
+        private void SetUpCallFeedbackActions()
+        {
+            Status.Call.Sharing.PropertyChanged += (o, a) =>
+            {
+                if (a.PropertyName == "State")
+                {
+                    SharingContentIsOnFeedback.FireUpdate();
+                    ReceivingContent.FireUpdate();
+                }
+            };
+
+            Status.Call.PropertyChanged += (o, a) =>
+            {
+                if (a.PropertyName == "Info")
+                {
+                    Debug.Console(1, this, "Updating Call Status");
+                    UpdateCallStatus();
+                }
+            };
+        }
 
         /// <summary>
         /// Subscribes to the PropertyChanged events on the state objects and fires the corresponding feedbacks.
@@ -1324,6 +1344,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                 if (callStatus != zStatus.eCallStatus.IN_MEETING || callStatus != zStatus.eCallStatus.CONNECTING_MEETING)
                 {
                     Status.Call = new zStatus.Call {Status = callStatus};
+
+                    SetUpCallFeedbackActions();
                 }
 
                 if (ActiveCalls.Count == 0)
@@ -1387,8 +1409,13 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                     ActiveCalls.Remove(call);
                 }
             }
-
             Debug.Console(1, this, "**************************************************************************");
+
+            //clear participants list after call cleanup
+            if (ActiveCalls.Count == 0)
+            {
+                Participants.CurrentParticipants = new List<Participant>();
+            }
         }
 
         protected override void OnCallStatusChange(CodecActiveCallItem item)