diff --git a/b2g/gaia/Makefile.in b/b2g/gaia/Makefile.in
index c544afc92566..2ba440f46c8a 100644
--- a/b2g/gaia/Makefile.in
+++ b/b2g/gaia/Makefile.in
@@ -7,7 +7,10 @@ GAIA_PATH := $(if MOZ_B2GDROID,gaia/assets/gaia,gaia/profile)
 
 # For b2gdroid, we disable the screen timeout since this is managed by android.
 # We also limit the app set to the production ones.
-GAIA_OPTIONS := $(if MOZ_B2GDROID,GAIA_DISTRIBUTION_DIR=distros/b2gdroid,)
+GAIA_OPTIONS := $(if MOZ_B2GDROID, \
+	GAIA_DISTRIBUTION_DIR=distros/b2gdroid \
+	NO_LOCK_SCREEN=1 \
+)
 
 GENERATED_DIRS += $(DIST)/bin/$(GAIA_PATH)
 
diff --git a/mobile/android/b2gdroid/app/src/main/java/org/mozilla/b2gdroid/Launcher.java b/mobile/android/b2gdroid/app/src/main/java/org/mozilla/b2gdroid/Launcher.java
index 0756069343bb..8cd0aa011b13 100644
--- a/mobile/android/b2gdroid/app/src/main/java/org/mozilla/b2gdroid/Launcher.java
+++ b/mobile/android/b2gdroid/app/src/main/java/org/mozilla/b2gdroid/Launcher.java
@@ -90,11 +90,6 @@ public class Launcher extends FragmentActivity
         IntentHelper.init(this);
         mScreenStateObserver = new ScreenStateObserver(this);
 
-        // Disable the default lockscreen.
-        KeyguardManager keyguardManager = (KeyguardManager)getSystemService(KEYGUARD_SERVICE);
-        KeyguardLock lock = keyguardManager.newKeyguardLock(KEYGUARD_SERVICE);
-        lock.disableKeyguard();
-
         initGecko();
 
         GeckoAppShell.setGeckoInterface(new BaseGeckoInterface(this));