diff --git a/CHANGELIST.md b/CHANGELIST.md
index f57f4274..3eb68714 100644
--- a/CHANGELIST.md
+++ b/CHANGELIST.md
@@ -97,6 +97,7 @@
 - Add files for XBONE
 - Update to DIC 20220707
 - Fix .bin file paths; update internal filename generation
+- Disable nonstandard BD-ROM sizes
 
 ### 2.3 (2022-02-05)
 - Start overhauling Redump information pulling, again
diff --git a/MPF.Library/InfoTool.cs b/MPF.Library/InfoTool.cs
index 9d715126..45dda399 100644
--- a/MPF.Library/InfoTool.cs
+++ b/MPF.Library/InfoTool.cs
@@ -863,12 +863,12 @@ namespace MPF.Library
                         return $"{mediaType.LongName()}-128";
                     else if (layerbreak2 != default)
                         return $"{mediaType.LongName()}-100";
-                    else if (layerbreak != default && size > 53_687_063_712)
-                        return $"{mediaType.LongName()}-66";
+                    //else if (layerbreak != default && size > 53_687_063_712)
+                    //    return $"{mediaType.LongName()}-66";
                     else if (layerbreak != default)
                         return $"{mediaType.LongName()}-50";
-                    else if (size > 26_843_531_856)
-                        return $"{mediaType.LongName()}-33";
+                    //else if (size > 26_843_531_856)
+                    //    return $"{mediaType.LongName()}-33";
                     else
                         return $"{mediaType.LongName()}-25";
 
@@ -1149,21 +1149,21 @@ namespace MPF.Library
             switch (info.CommonDiscInfo.Media)
             {
                 case DiscType.BD25:
-                case DiscType.BD33:
+                //case DiscType.BD33:
                 case DiscType.BD50:
-                case DiscType.BD66:
+                //case DiscType.BD66:
                 case DiscType.BD100:
                 case DiscType.BD128:
                     if (info.SizeAndChecksums.Layerbreak3 != default)
                         info.CommonDiscInfo.Media = DiscType.BD128;
                     else if (info.SizeAndChecksums.Layerbreak2 != default)
                         info.CommonDiscInfo.Media = DiscType.BD100;
-                    else if (info.SizeAndChecksums.Layerbreak != default && info.SizeAndChecksums.Size > 53_687_063_712)
-                        info.CommonDiscInfo.Media = DiscType.BD66;
+                    //else if (info.SizeAndChecksums.Layerbreak != default && info.SizeAndChecksums.Size > 53_687_063_712)
+                    //    info.CommonDiscInfo.Media = DiscType.BD66;
                     else if (info.SizeAndChecksums.Layerbreak != default)
                         info.CommonDiscInfo.Media = DiscType.BD50;
-                    else if (info.SizeAndChecksums.Size > 26_843_531_856)
-                        info.CommonDiscInfo.Media = DiscType.BD33;
+                    //else if (info.SizeAndChecksums.Size > 26_843_531_856)
+                    //    info.CommonDiscInfo.Media = DiscType.BD33;
                     else
                         info.CommonDiscInfo.Media = DiscType.BD25;
                     break;
diff --git a/MPF.Test/Library/InfoToolTests.cs b/MPF.Test/Library/InfoToolTests.cs
index da0143cc..9478645d 100644
--- a/MPF.Test/Library/InfoToolTests.cs
+++ b/MPF.Test/Library/InfoToolTests.cs
@@ -25,9 +25,9 @@ namespace MPF.Test.Library
         [InlineData(MediaType.DVD, 12345, 1, 2, 3, "DVD-ROM-9")]
         [InlineData(MediaType.BluRay, 0, 0, 0, 0, "BD-ROM-25")]
         [InlineData(MediaType.BluRay, 12345, 0, 0, 0, "BD-ROM-25")]
-        [InlineData(MediaType.BluRay, 26_843_531_857, 0, 0, 0, "BD-ROM-33")]
+        //[InlineData(MediaType.BluRay, 26_843_531_857, 0, 0, 0, "BD-ROM-33")]
         [InlineData(MediaType.BluRay, 12345, 1, 0, 0, "BD-ROM-50")]
-        [InlineData(MediaType.BluRay, 53_687_063_713, 1, 0, 0, "BD-ROM-66")]
+        //[InlineData(MediaType.BluRay, 53_687_063_713, 1, 0, 0, "BD-ROM-66")]
         [InlineData(MediaType.BluRay, 12345, 1, 2, 0, "BD-ROM-100")]
         [InlineData(MediaType.BluRay, 12345, 1, 2, 3, "BD-ROM-128")]
         [InlineData(MediaType.UMD, 0, 0, 0, 0, "UMD-SL")]
diff --git a/MPF.Test/RedumpLib/ExtensionsTests.cs b/MPF.Test/RedumpLib/ExtensionsTests.cs
index fcc2cb83..826aca68 100644
--- a/MPF.Test/RedumpLib/ExtensionsTests.cs
+++ b/MPF.Test/RedumpLib/ExtensionsTests.cs
@@ -18,9 +18,9 @@ namespace MPF.Test.RedumpLib
         private static readonly DiscType?[] _mappableDiscTypes = new DiscType?[]
         {
             DiscType.BD25,
-            DiscType.BD33,
+            //DiscType.BD33,
             DiscType.BD50,
-            DiscType.BD66,
+            //DiscType.BD66,
             DiscType.BD100,
             DiscType.BD128,
             DiscType.CD,
diff --git a/MPF.UI.Core/ViewModels/DiscInformationViewModel.cs b/MPF.UI.Core/ViewModels/DiscInformationViewModel.cs
index fc20a304..24c3273e 100644
--- a/MPF.UI.Core/ViewModels/DiscInformationViewModel.cs
+++ b/MPF.UI.Core/ViewModels/DiscInformationViewModel.cs
@@ -654,9 +654,9 @@ namespace MPF.UI.Core.ViewModels
                 case DiscType.HDDVDSL:
                 case DiscType.HDDVDDL:
                 case DiscType.BD25:
-                case DiscType.BD33:
+                //case DiscType.BD33:
                 case DiscType.BD50:
-                case DiscType.BD66:
+                //case DiscType.BD66:
                 case DiscType.BD100:
                 case DiscType.BD128:
                 case DiscType.NintendoGameCubeGameDisc:
diff --git a/RedumpLib/Data/Enumerations.cs b/RedumpLib/Data/Enumerations.cs
index 8ac502f7..a260d1a5 100644
--- a/RedumpLib/Data/Enumerations.cs
+++ b/RedumpLib/Data/Enumerations.cs
@@ -56,14 +56,14 @@ namespace RedumpLib.Data
         [HumanReadable(LongName = "BD-25")]
         BD25,
 
-        [HumanReadable(LongName = "BD-33")]
-        BD33,
+        //[HumanReadable(LongName = "BD-33")]
+        //BD33,
 
         [HumanReadable(LongName = "BD-50")]
         BD50,
 
-        [HumanReadable(LongName = "BD-66")]
-        BD66,
+        //[HumanReadable(LongName = "BD-66")]
+        //BD66,
 
         [HumanReadable(LongName = "BD-100")]
         BD100,
diff --git a/RedumpLib/Data/Extensions.cs b/RedumpLib/Data/Extensions.cs
index 9617f1f8..cfd1eb41 100644
--- a/RedumpLib/Data/Extensions.cs
+++ b/RedumpLib/Data/Extensions.cs
@@ -747,9 +747,9 @@ namespace RedumpLib.Data
             switch (discType)
             {
                 case DiscType.BD25:
-                case DiscType.BD33:
+                //case DiscType.BD33:
                 case DiscType.BD50:
-                case DiscType.BD66:
+                //case DiscType.BD66:
                 case DiscType.BD100:
                 case DiscType.BD128:
                     return MediaType.BluRay;
@@ -852,15 +852,15 @@ namespace RedumpLib.Data
                 case "bd25":
                 case "bd-25":
                     return DiscType.BD25;
-                case "bd33":
-                case "bd-33":
-                    return DiscType.BD33;
+                //case "bd33":
+                //case "bd-33":
+                //    return DiscType.BD33;
                 case "bd50":
                 case "bd-50":
                     return DiscType.BD50;
-                case "bd66":
-                case "bd-66":
-                    return DiscType.BD66;
+                //case "bd66":
+                //case "bd-66":
+                //    return DiscType.BD66;
                 case "bd100":
                 case "bd-100":
                     return DiscType.BD100;