diff --git a/PepperDashEssentials/Bridges/DmChassisControllerBridge.cs b/PepperDashEssentials/Bridges/DmChassisControllerBridge.cs
index 718fa399..17c80474 100644
--- a/PepperDashEssentials/Bridges/DmChassisControllerBridge.cs
+++ b/PepperDashEssentials/Bridges/DmChassisControllerBridge.cs
@@ -85,7 +85,9 @@ namespace PepperDash.Essentials.Bridges
                                         SetHdcpCapabilityAction(true, hdmiInPortWCec, joinMap.HdcpSupportState + ioSlot, trilist);
                                     }
 
-                                    dmChassis.InputCardHdcpCapabilityFeedbacks[ioSlot].LinkInputSig(trilist.UShortInput[joinMap.HdcpSupportState]);
+                                    dmChassis.InputCardHdcpCapabilityFeedbacks[ioSlot].LinkInputSig(trilist.UShortInput[joinMap.HdcpSupportState + ioSlot]);
+
+                                    trilist.UShortInput[joinMap.HdcpSupportCapability + ioSlot].UShortValue = (ushort)dmChassis.InputCardHdcpCapabilityTypes[ioSlot];
                                 }
                             }
                         }
diff --git a/essentials-framework/Essentials DM/Essentials_DM/Chassis/DmChassisController.cs b/essentials-framework/Essentials DM/Essentials_DM/Chassis/DmChassisController.cs
index 8b5761c2..eb3016d4 100644
--- a/essentials-framework/Essentials DM/Essentials_DM/Chassis/DmChassisController.cs	
+++ b/essentials-framework/Essentials DM/Essentials_DM/Chassis/DmChassisController.cs	
@@ -37,6 +37,8 @@ namespace PepperDash.Essentials.DM
         public Dictionary<uint, StringFeedback> OutputAudioRouteNameFeedbacks { get; private set; }
 
         public Dictionary<uint, IntFeedback> InputCardHdcpCapabilityFeedbacks { get; private set; }
+
+        public Dictionary<uint, eHdcpCapabilityType> InputCardHdcpCapabilityTypes { get; private set; }
 		
 		
 		// Need a couple Lists of generic Backplane ports
@@ -158,6 +160,7 @@ namespace PepperDash.Essentials.DM
             OutputEndpointOnlineFeedbacks = new Dictionary<uint, BoolFeedback>();
 
             InputCardHdcpCapabilityFeedbacks = new Dictionary<uint, IntFeedback>();
+            InputCardHdcpCapabilityTypes = new Dictionary<uint, eHdcpCapabilityType>();
 
 
 			for (uint x = 1; x <= Chassis.NumberOfOutputs; x++) 
@@ -228,6 +231,8 @@ namespace PepperDash.Essentials.DM
 
                     if (inputCard.Card is DmcHd)
                     {
+                        InputCardHdcpCapabilityTypes[tempX] = eHdcpCapabilityType.HdcpAutoSupport;
+
                         if ((inputCard.Card as DmcHd).HdmiInput.HdcpSupportOnFeedback.BoolValue)
                             return 1;
                         else
@@ -235,6 +240,8 @@ namespace PepperDash.Essentials.DM
                     }
                     else if (inputCard.Card is DmcHdDsp)
                     {
+                        InputCardHdcpCapabilityTypes[tempX] = eHdcpCapabilityType.HdcpAutoSupport;
+
                         if ((inputCard.Card as DmcHdDsp).HdmiInput.HdcpSupportOnFeedback.BoolValue)
                             return 1;
                         else
@@ -242,6 +249,8 @@ namespace PepperDash.Essentials.DM
                     }
                     else if (inputCard.Card is Dmc4kHdBase)
                     {
+                        InputCardHdcpCapabilityTypes[tempX] = eHdcpCapabilityType.Hdcp2_2Support;
+
                         return (int)(inputCard.Card as Dmc4kHdBase).HdmiInput.HdcpReceiveCapability;
                     }
                     else