diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoThread.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoThread.java
index 5fa5037c1a06..b0c1f9eb4bcd 100644
--- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoThread.java
+++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoThread.java
@@ -284,8 +284,6 @@ public class GeckoThread extends Thread {
 
         final String resourcePath = context.getPackageResourcePath();
 
-        GeckoSystemStateListener.getInstance().initialize(context);
-
         try {
             loadGeckoLibs(context, resourcePath);
             return;
diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntime.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntime.java
index 10346a4e2f18..258efb8d06fa 100644
--- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntime.java
+++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntime.java
@@ -232,6 +232,8 @@ public final class GeckoRuntime implements Parcelable {
 
         // Initialize the system ClipboardManager by accessing it on the main thread.
         GeckoAppShell.getApplicationContext().getSystemService(Context.CLIPBOARD_SERVICE);
+
+        GeckoSystemStateListener.getInstance().initialize(context);
         return true;
     }
 
diff --git a/widget/android/nsAppShell.cpp b/widget/android/nsAppShell.cpp
index fcb94982f7c8..c8ce9f903a80 100644
--- a/widget/android/nsAppShell.cpp
+++ b/widget/android/nsAppShell.cpp
@@ -412,7 +412,6 @@ nsAppShell::nsAppShell()
         if (jni::IsAvailable()) {
             GeckoThreadSupport::Init();
             GeckoAppShellSupport::Init();
-            mozilla::GeckoSystemStateListener::Init();
             mozilla::widget::Telemetry::Init();
 
             // Set the corresponding state in GeckoThread.