diff --git a/project/java/SettingsMenuMisc.java b/project/java/SettingsMenuMisc.java
index 552a0a910..d26c6c1af 100644
--- a/project/java/SettingsMenuMisc.java
+++ b/project/java/SettingsMenuMisc.java
@@ -421,7 +421,7 @@ class SettingsMenuMisc extends SettingsMenu
 				"OUYA emulation"
 			};
 			boolean defaults[] = {
-				false,
+				Globals.OuyaEmulation,
 			};
 
 			AlertDialog.Builder builder = new AlertDialog.Builder(p);
diff --git a/project/jni/application/openarena/engine b/project/jni/application/openarena/engine
index c6164a2a5..07c6f6108 160000
--- a/project/jni/application/openarena/engine
+++ b/project/jni/application/openarena/engine
@@ -1 +1 @@
-Subproject commit c6164a2a58d6a004ffbd54cf6e987e6ad2e74010
+Subproject commit 07c6f6108d8e9b821ef8212cabef062039761dfa