diff --git a/android/phoenix/res/xml/prefs.xml b/android/phoenix/res/xml/prefs.xml
index 94c6e5b452..7be204e611 100644
--- a/android/phoenix/res/xml/prefs.xml
+++ b/android/phoenix/res/xml/prefs.xml
@@ -120,6 +120,12 @@
                 android:summary="Use (very) high latency audio. Necessary for older Android devices with poor audio drivers."
                 android:title="High latency audio"
                 android:dependency="audio_enable" />
+            <CheckBoxPreference 
+                android:defaultValue="true"
+                android:key="audio_latency_auto"
+                android:summary="Use automatic audio latency detection. Only available for Android 4.1 and up - your mileage may vary based on the device you are using."
+                android:title="Automatic audio latency"
+                android:dependency="audio_enable" />
         </PreferenceCategory>
     </PreferenceScreen>
     <PreferenceScreen android:title="Input Options" >
diff --git a/android/phoenix/src/org/retroarch/browser/MainMenuActivity.java b/android/phoenix/src/org/retroarch/browser/MainMenuActivity.java
index e3a42d0064..710f799649 100644
--- a/android/phoenix/src/org/retroarch/browser/MainMenuActivity.java
+++ b/android/phoenix/src/org/retroarch/browser/MainMenuActivity.java
@@ -359,7 +359,8 @@ public class MainMenuActivity extends PreferenceActivity {
 		config.setInt("audio_out_rate", optimalRate);
 		
 		// Refactor this entire mess and make this usable for per-core config
-		if (android.os.Build.VERSION.SDK_INT >= 17) {
+		if (android.os.Build.VERSION.SDK_INT >= 17 &&
+				prefs.getBoolean("audio_latency_auto", true) == true) {
 			int buffersize = getLowLatencyBufferSize();
 
 			boolean lowLatency = hasLowLatencyAudio();