diff --git a/frameworks/core/res/src/com/droidlogic/NetflixService.java b/frameworks/core/res/src/com/droidlogic/NetflixService.java
index 8dbd26c..e8b4650 100755
--- a/frameworks/core/res/src/com/droidlogic/NetflixService.java
+++ b/frameworks/core/res/src/com/droidlogic/NetflixService.java
@@ -169,10 +169,12 @@ public class NetflixService extends Service {
             String audioSinkCap = mSCM.readSysFs(SYS_AUDIO_CAP);
             atmosSupported = audioSinkCap.contains("Dobly_Digital+/ATMOS");
             doblySupported = audioSinkCap.contains("Dobly_Digital");
-            if (hasMS12 && isConnected && (DIGITAL_AUTO == surround) ) {
-                Log.i (TAG, "ATMOS: " + atmosSupported + ", audioSinkCap: " + audioSinkCap);
+            if (isConnected && (DIGITAL_AUTO == surround)) {
+                Log.i (TAG, "MS12: " + hasMS12 + ", ATMOS: " + atmosSupported + ", audioSinkCap: " + audioSinkCap);
                 setAtmosEnabled(atmosSupported);
-                setUiAudioBufferDelayOffset(doblySupported);
+                if (hasMS12) {
+                    setUiAudioBufferDelayOffset(doblySupported);
+                }
             }
         }
     };
@@ -447,6 +449,10 @@ public class NetflixService extends Service {
                 Log.i(TAG, "ATMOS enabled -> " + enabled);
                 atmosObject.put("enabled", enabled);
                 Settings.Global.putString(getContentResolver(), NRDP_AUDIO_PLATFORM_CAP, rootObject.toString());
+            } else if (isEnabled) {
+                Log.i(TAG, "ATMOS enabled -> " + enabled);
+                atmosObject.put("enabled", enabled);
+                Settings.Global.putString(getContentResolver(), NRDP_AUDIO_PLATFORM_CAP, rootObject.toString());
             }
         } catch (org.json.JSONException e) {
             e.printStackTrace();