diff --git a/android/app-android.cpp b/android/app-android.cpp
index f4dd3006c9..bf4407692f 100644
--- a/android/app-android.cpp
+++ b/android/app-android.cpp
@@ -249,10 +249,14 @@ extern "C" void Java_com_henrikrydgard_libnative_NativeApp_init
 
 extern "C" void Java_com_henrikrydgard_libnative_NativeApp_audioInit(JNIEnv *, jclass) {
 	sampleRate = optimalSampleRate;
-	if (NativeQueryConfig("force44khz") != "0") {
+	if (NativeQueryConfig("force44khz") != "0" || optimalSampleRate == 0) {
 		sampleRate = 44100;
 	}
-	framesPerBuffer = optimalFramesPerBuffer;
+	if (optimalFramesPerBuffer > 0) {
+		framesPerBuffer = optimalFramesPerBuffer;
+	} else {
+		framesPerBuffer = 512;
+	}
 	ILOG("NativeApp.audioInit() -- Using OpenSL audio! frames/buffer: %i   optimal sr: %i   actual sr: %i", optimalFramesPerBuffer, optimalSampleRate, sampleRate);
 	AndroidAudio_Init(&NativeMix, library_path, framesPerBuffer, sampleRate);
 }