diff --git a/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginWpcomService.java b/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginWpcomService.java
index 8d2f55c750..445e10f3ba 100644
--- a/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginWpcomService.java
+++ b/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginWpcomService.java
@@ -278,6 +278,12 @@ public void onDestroy() {
         super.onDestroy();
     }
 
+    @Override
+    public void onTimeout(int startId) {
+        super.onTimeout(startId);
+        setState(LoginStep.FAILURE); // This will cal stopSelf()
+    }
+
     @Override
     public int onStartCommand(@Nullable Intent intent, int flags, int startId) {
         if (intent == null) {