diff --git a/android/src/org/rockbox/RockboxActivity.java b/android/src/org/rockbox/RockboxActivity.java
index f3f0d2151c..90c687f35a 100644
--- a/android/src/org/rockbox/RockboxActivity.java
+++ b/android/src/org/rockbox/RockboxActivity.java
@@ -95,7 +95,7 @@ public class RockboxActivity extends Activity
     private void setServiceActivity(boolean set)
     {
         if (rbservice != null)
-            rbservice.set_activity(this);
+            rbservice.set_activity(set ? this : null);
     }
 
     private void attachFramebuffer()