diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java
index 614a1076f6..6df525e4bc 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java
@@ -391,13 +391,19 @@ public final class NativeLibrary
 
 	public static void endEmulationActivity()
 	{
-		Log.verbose("[NativeLibrary]Ending EmulationActivity.");
+		Log.verbose("[NativeLibrary] Ending EmulationActivity.");
 		sEmulationActivity.exitWithAnimation();
 	}
 
 	public static void setEmulationActivity(EmulationActivity emulationActivity)
 	{
-		Log.verbose("[NativeLibrary]Registering EmulationActivity.");
+		Log.verbose("[NativeLibrary] Registering EmulationActivity.");
 		sEmulationActivity = emulationActivity;
 	}
+
+	public static void clearEmulationActivity()
+	{
+		Log.verbose("[NativeLibrary] Unregistering EmulationActivity.");
+		sEmulationActivity = null;
+	}
 }
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java
index 06370c0028..773e0a7880 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java
@@ -332,7 +332,7 @@ public final class EmulationActivity extends AppCompatActivity
 		super.onStop();
 		Log.debug("[EmulationActivity] EmulationActivity stopping.");
 
-		NativeLibrary.setEmulationActivity(null);
+		NativeLibrary.clearEmulationActivity();
 	}
 
 	@Override