diff --git a/CHANGELIST.md b/CHANGELIST.md
index 5ef78b87..201cd93e 100644
--- a/CHANGELIST.md
+++ b/CHANGELIST.md
@@ -26,6 +26,7 @@
 - Update AppVeyor version
 - Output security sectors to info
 - Remove x86 requirement for build
+- Fix XGD media type outputs
 
 ### 2.4 (2022-10-26)
 - Update to DIC 20211001
diff --git a/MPF.Library/InfoTool.cs b/MPF.Library/InfoTool.cs
index c84e1b22..2a648c10 100644
--- a/MPF.Library/InfoTool.cs
+++ b/MPF.Library/InfoTool.cs
@@ -834,11 +834,9 @@ namespace MPF.Library
                     output.Add(""); output.Add("Size & Checksum:");
 
                     // Gross hack because of automatic layerbreaks in Redump
-                    if ((info.CommonDiscInfo.Media != DiscType.BD25
-                            && info.CommonDiscInfo.Media != DiscType.BD50
-                            && info.CommonDiscInfo.Media != DiscType.BD100
-                            && info.CommonDiscInfo.Media != DiscType.BD128)
-                        || (!options.EnableRedumpCompatibility))
+                    if (!options.EnableRedumpCompatibility
+                        || (info.CommonDiscInfo.Media.ToMediaType() != MediaType.BluRay
+                            && !info.CommonDiscInfo.System.IsXGD()))
                     {
                         AddIfExists(output, Template.LayerbreakField, (info.SizeAndChecksums.Layerbreak == default ? null : info.SizeAndChecksums.Layerbreak.ToString()), 1);
                     }
diff --git a/MPF.Modules/DiscImageCreator/Parameters.cs b/MPF.Modules/DiscImageCreator/Parameters.cs
index 060dfc5d..3831b287 100644
--- a/MPF.Modules/DiscImageCreator/Parameters.cs
+++ b/MPF.Modules/DiscImageCreator/Parameters.cs
@@ -447,11 +447,8 @@ namespace MPF.Modules.DiscImageCreator
                     // Deal with the layerbreaks
                     if (this.Type == MediaType.DVD)
                     {
-                        if (!options.EnableRedumpCompatibility || !System.IsXGD())
-                        {
-                            string layerbreak = GetLayerbreak($"{basePath}_disc.txt", System.IsXGD()) ?? "";
-                            info.SizeAndChecksums.Layerbreak = !string.IsNullOrEmpty(layerbreak) ? Int64.Parse(layerbreak) : default;
-                        }
+                        string layerbreak = GetLayerbreak($"{basePath}_disc.txt", System.IsXGD()) ?? "";
+                        info.SizeAndChecksums.Layerbreak = !string.IsNullOrEmpty(layerbreak) ? Int64.Parse(layerbreak) : default;
                     }
                     else if (this.Type == MediaType.BluRay)
                     {