diff --git a/Simulation/Digitization/python/DigiOutput.py b/Simulation/Digitization/python/DigiOutput.py
index 1bb9b090cf44291f99d24422051d314935f98001..87c6dc6d3fe55c21c0fee66979eda3c8a40c559e 100644
--- a/Simulation/Digitization/python/DigiOutput.py
+++ b/Simulation/Digitization/python/DigiOutput.py
@@ -133,8 +133,10 @@ def getStreamRDO_ItemList(log):
         if DetFlags.writeRDOPool.LAr_on():
             if not digitizationFlags.PileUpPremixing:
                 StreamRDO_ItemList+=["LArRawChannelContainer#*"]
-            if 'AddCaloDigi' in digitizationFlags.experimentalDigi() or digitizationFlags.PileUpPremixing:
+            if 'AddCaloDigi' in digitizationFlags.experimentalDigi():
                 StreamRDO_ItemList+=["LArDigitContainer#*"]
+            elif digitizationFlags.PileUpPremixing:
+                StreamRDO_ItemList+=["LArDigitContainer#LArDigitContainer_MC"]
             else:
                 StreamRDO_ItemList+=["LArDigitContainer#LArDigitContainer_MC_Thinned"]
     if hasattr(DetFlags.digitize, 'HGTD_on') and DetFlags.digitize.HGTD_on():
@@ -144,8 +146,10 @@ def getStreamRDO_ItemList(log):
         if DetFlags.writeRDOPool.Tile_on():
             if not digitizationFlags.PileUpPremixing:
                 StreamRDO_ItemList+=["TileRawChannelContainer#*"]
-            if 'AddCaloDigi' in digitizationFlags.experimentalDigi() or digitizationFlags.PileUpPremixing:
+            if 'AddCaloDigi' in digitizationFlags.experimentalDigi():
                 StreamRDO_ItemList+=["TileDigitsContainer#*"]
+            elif digitizationFlags.PileUpPremixing:
+                StreamRDO_ItemList+=["TileDigitsContainer#TileDigitsCnt"]
             else:
                 StreamRDO_ItemList+=["TileDigitsContainer#TileDigitsFlt"]
             StreamRDO_ItemList+=["TileL2Container#TileL2Cnt"]
diff --git a/Simulation/SimuJobTransforms/share/skeleton.HITtoRDO.py b/Simulation/SimuJobTransforms/share/skeleton.HITtoRDO.py
index 1c13e256ed99a5f8a5c416a4fe030194f172002f..d9818a640a885aea0af8b760f6aba60aa511209d 100644
--- a/Simulation/SimuJobTransforms/share/skeleton.HITtoRDO.py
+++ b/Simulation/SimuJobTransforms/share/skeleton.HITtoRDO.py
@@ -356,7 +356,7 @@ if hasattr(runArgs,"outputRDOFile") or hasattr(runArgs,"outputRDO_FILTFile"):
         athenaCommonFlags.PoolRDOOutput.set_Value_and_Lock( runArgs.outputRDOFile )
     elif hasattr(runArgs,"outputRDO_FILTFile"):
         athenaCommonFlags.PoolRDOOutput.set_Value_and_Lock( runArgs.outputRDO_FILTFile )
-    if digitizationFlags.PileUpPremixing or (hasattr(runArgs, "AddCaloDigi") and runArgs.AddCaloDigi):
+    if hasattr(runArgs, "AddCaloDigi") and runArgs.AddCaloDigi:
         digilog.info("Will write out all LArDigitContainers and TileDigitsContainers to RDO file.")
         digitizationFlags.experimentalDigi+=["AddCaloDigi"]
 else: