diff --git a/DiscImageChef.Core/Devices/Dumping/CompactDisc/Dump.cs b/DiscImageChef.Core/Devices/Dumping/CompactDisc/Dump.cs
index 36846cbfc..cd8da73ea 100644
--- a/DiscImageChef.Core/Devices/Dumping/CompactDisc/Dump.cs
+++ b/DiscImageChef.Core/Devices/Dumping/CompactDisc/Dump.cs
@@ -284,12 +284,8 @@ namespace DiscImageChef.Core.Devices.Dumping
                     }
 
                     _dumpLog.WriteLine("Drive can read without subchannel...");
-                    _dumpLog.WriteLine("WARNING: If disc says CD+G, CD+EG, CD-MIDI, CD Graphics or CD Enhanced Graphics, dump will be incorrect!");
                     UpdateStatus?.Invoke("Drive can read without subchannel...");
 
-                    UpdateStatus?.
-                        Invoke("WARNING: If disc says CD+G, CD+EG, CD-MIDI, CD Graphics or CD Enhanced Graphics, dump will be incorrect!");
-
                     subSize = 0;
                     subType = TrackSubchannelType.None;
 
@@ -442,6 +438,15 @@ namespace DiscImageChef.Core.Devices.Dumping
                 tracks = trkList.ToArray();
             }
 
+            if(tracks.Any(t => t.TrackType == TrackType.Audio) &&
+               supportedSubchannel != MmcSubchannel.Raw)
+            {
+                _dumpLog.WriteLine("WARNING: If disc says CD+G, CD+EG, CD-MIDI, CD Graphics or CD Enhanced Graphics, dump will be incorrect!");
+
+                UpdateStatus?.
+                    Invoke("WARNING: If disc says CD+G, CD+EG, CD-MIDI, CD Graphics or CD Enhanced Graphics, dump will be incorrect!");
+            }
+
             // Check mode for tracks
             for(int t = 0; t < tracks.Length; t++)
             {