diff --git a/DICUI.Library/DiscImageCreator/Parameters.cs b/DICUI.Library/DiscImageCreator/Parameters.cs
index 43eebe7e..c7903784 100644
--- a/DICUI.Library/DiscImageCreator/Parameters.cs
+++ b/DICUI.Library/DiscImageCreator/Parameters.cs
@@ -1577,7 +1577,6 @@ namespace DICUI.DiscImageCreator
                         info.SizeAndChecksums.CRC32 = crc32;
                         info.SizeAndChecksums.MD5 = md5;
                         info.SizeAndChecksums.SHA1 = sha1;
-                        info.TracksAndWriteOffsets.ClrMameProData = null;
                     }
 
                     // Deal with the layerbreak
diff --git a/DICUI.Library/Utilities/DumpEnvironment.cs b/DICUI.Library/Utilities/DumpEnvironment.cs
index 60069ea6..d68bc677 100644
--- a/DICUI.Library/Utilities/DumpEnvironment.cs
+++ b/DICUI.Library/Utilities/DumpEnvironment.cs
@@ -723,6 +723,10 @@ namespace DICUI.Utilities
                 }
             }
 
+            // If we have both ClrMamePro and Size and Checksums data, remove the ClrMamePro
+            if (!string.IsNullOrWhiteSpace(info.SizeAndChecksums.CRC32))
+                info.TracksAndWriteOffsets.ClrMameProData = null;
+
             // Extract info based generically on MediaType
             switch (Type)
             {