diff --git a/lcls-twincat-pmps/PMPS/MajorComponents/FB_BeamClassFromEPICS.TcPOU b/lcls-twincat-pmps/PMPS/MajorComponents/FB_BeamClassFromEPICS.TcPOU
index da15239..0205f0d 100644
--- a/lcls-twincat-pmps/PMPS/MajorComponents/FB_BeamClassFromEPICS.TcPOU
+++ b/lcls-twincat-pmps/PMPS/MajorComponents/FB_BeamClassFromEPICS.TcPOU
@@ -54,10 +54,10 @@ ELSE
     BP.nBeamClass := cFailSafeBC;
 END_IF
 BP.nBCRange := TO_WORD(BP.nBeamClass);
-
-ffBeamClassReadback(i_xOK:=fbMPS_BeamClass.bValid, io_fbFFHWO:=FFO);
+// i_xOK is TRUE if we get a valid reading from epics or we are in NC mode, then we ignore the invalid reading.
+ffBeamClassReadback(i_xOK:= (fbMPS_BeamClass.bValid OR BP.nMachineMode = 0) , io_fbFFHWO:=FFO);
 
 BP.xValid R= NOT fbMPS_BeamClass.bValid;]]></ST>
     </Implementation>
   </POU>
-</TcPlcObject>
+</TcPlcObject>
\ No newline at end of file
diff --git a/lcls-twincat-pmps/PMPS/PMPS.tmc b/lcls-twincat-pmps/PMPS/PMPS.tmc
index f098917..b43264b 100644
--- a/lcls-twincat-pmps/PMPS/PMPS.tmc
+++ b/lcls-twincat-pmps/PMPS/PMPS.tmc
@@ -31620,7 +31620,7 @@ request loop (two arbiters elevating to each other), or there is a RequestAdd, R
         </Property>
         <Property>
           <Name>ChangeDate</Name>
-          <Value>2025-07-29T11:12:16</Value>
+          <Value>2025-12-16T08:53:46</Value>
         </Property>
         <Property>
           <Name>GeneratedCodeSize</Name>