diff --git a/src/net/i2p/android/router/MainFragment.java b/src/net/i2p/android/router/MainFragment.java
index 4550837f2c868911593158c88557bb6ed4ad28ac..7e90c9ffaec9cd47aacfbe8a3bd720f43fa3564e 100644
--- a/src/net/i2p/android/router/MainFragment.java
+++ b/src/net/i2p/android/router/MainFragment.java
@@ -171,6 +171,14 @@ public class MainFragment extends I2PFragmentBase {
 
         boolean isOn = mCallback.shouldBeOn();
         b.setChecked(isOn);
+
+        if (!isOn) {
+            // Sometimes the final state message from the RouterService
+            // is not received. Ensure that the state image is correct.
+            // TODO: Fix the race between RouterService shutdown and
+            // IRouterState unbinding.
+            updateState("INIT");
+        }
     }
 
     public boolean onBackPressed() {