diff --git a/src/NzbDrone.Core.Test/MediaFiles/MediaInfo/MediaInfoFormatterTests/FormatAudioCodecFixture.cs b/src/NzbDrone.Core.Test/MediaFiles/MediaInfo/MediaInfoFormatterTests/FormatAudioCodecFixture.cs
index 025af84a6..09156a025 100644
--- a/src/NzbDrone.Core.Test/MediaFiles/MediaInfo/MediaInfoFormatterTests/FormatAudioCodecFixture.cs
+++ b/src/NzbDrone.Core.Test/MediaFiles/MediaInfo/MediaInfoFormatterTests/FormatAudioCodecFixture.cs
@@ -43,8 +43,8 @@ public void should_format_audio_format_legacy(string audioFormat, string expecte
         [TestCase("DTS, A_DTS, , , ES XXCH", "DTS", "DTS-ES")]
         [TestCase("DTS, A_DTS, , , XBR", "DTSHD-HRA", "DTS-HD HRA")]
         [TestCase("DTS, A_DTS, , , DTS", "DTS", "DTS")]
-        [TestCase("E-AC-3, A_EAC3, , , JOC", "EAC3", "EAC3")]
-        [TestCase("E-AC-3, A_EAC3, , , ", "DD5.1", "EAC3")]
+        [TestCase("E-AC-3, A_EAC3, , , JOC", "EAC3.Atmos", "EAC3 Atmos")]
+        [TestCase("E-AC-3, A_EAC3, , , ", "DDP5.1", "EAC3")]
         [TestCase("AC-3, A_AC3, , , ", "DD5.1", "AC3")]
         [TestCase("A_QUICKTIME, A_QUICKTIME, , , ", "", "")]
         [TestCase("ADPCM, 2, , , ", "Custom?", "PCM")]
diff --git a/src/NzbDrone.Core/MediaFiles/MediaInfo/MediaInfoFormatter.cs b/src/NzbDrone.Core/MediaFiles/MediaInfo/MediaInfoFormatter.cs
index 0c1760f61..216e72861 100644
--- a/src/NzbDrone.Core/MediaFiles/MediaInfo/MediaInfoFormatter.cs
+++ b/src/NzbDrone.Core/MediaFiles/MediaInfo/MediaInfoFormatter.cs
@@ -100,6 +100,11 @@ public static string FormatAudioCodec(MediaInfoModel mediaInfo, string sceneName
 
             if (audioFormat.ContainsIgnoreCase("E-AC-3"))
             {
+                if (splitAdditionalFeatures.ContainsIgnoreCase("JOC"))
+                {
+                    return "EAC3 Atmos";
+                }
+
                 return "EAC3";
             }