diff --git a/DICUI/Utilities/DumpEnvironment.cs b/DICUI/Utilities/DumpEnvironment.cs
index f693de58..d25f38bb 100644
--- a/DICUI/Utilities/DumpEnvironment.cs
+++ b/DICUI/Utilities/DumpEnvironment.cs
@@ -688,12 +688,15 @@ namespace DICUI.Utilities
                         break;
                     case KnownSystem.MicrosoftXBOX:
                     case KnownSystem.MicrosoftXBOX360:
-                        output.Add(Template.XBOXDMIHash + ": " + info[Template.XBOXDMIHash]);
-                        output.Add(Template.XBOXPFIHash + ": " + info[Template.XBOXPFIHash]);
-                        output.Add(Template.XBOXSSHash + ": " + info[Template.XBOXSSHash]); output.Add("");
-                        output.Add(Template.XBOXSSVersion + ": " + info[Template.XBOXSSVersion]);
-                        output.Add(Template.XBOXSSRanges + ":"); output.Add("");
-                        output.AddRange(info[Template.XBOXSSRanges].Split('\n'));
+                        if (Type == MediaType.DVD)
+                        {
+                            output.Add(Template.XBOXDMIHash + ": " + info[Template.XBOXDMIHash]);
+                            output.Add(Template.XBOXPFIHash + ": " + info[Template.XBOXPFIHash]);
+                            output.Add(Template.XBOXSSHash + ": " + info[Template.XBOXSSHash]); output.Add("");
+                            output.Add(Template.XBOXSSVersion + ": " + info[Template.XBOXSSVersion]);
+                            output.Add(Template.XBOXSSRanges + ":"); output.Add("");
+                            output.AddRange(info[Template.XBOXSSRanges].Split('\n'));
+                        }
                         break;
                     case KnownSystem.SonyPlayStation4:
                         output.Add(Template.PlayStation4PICField + ":"); output.Add("");
diff --git a/DICUI/Utilities/Parameters.cs b/DICUI/Utilities/Parameters.cs
index b947c670..9a8c4cfb 100644
--- a/DICUI/Utilities/Parameters.cs
+++ b/DICUI/Utilities/Parameters.cs
@@ -1259,11 +1259,6 @@ namespace DICUI.Utilities
             switch (type)
             {
                 case MediaType.CD:
-                    if (system == KnownSystem.MicrosoftXBOX)
-                    {
-                        Command = DICCommand.XBOX;
-                        return;
-                    }
                     Command = DICCommand.CompactDisc;
                     return;
                 case MediaType.DVD: