diff --git a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowInputMethodManager.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowInputMethodManager.java
index e6ad1293b1d..ee25a81beb7 100644
--- a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowInputMethodManager.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowInputMethodManager.java
@@ -267,9 +267,10 @@ public static void reset() {
     _InputMethodManager_ _reflector = reflector(_InputMethodManager_.class);
     if (apiLevel <= JELLY_BEAN_MR1) {
       _reflector.setMInstance(null);
-    } else if (apiLevel <= P) {
-      _reflector.setInstance(null);
     } else {
+      _reflector.setInstance(null);
+    }
+    if (apiLevel > P) {
       _reflector.getInstanceMap().clear();
     }
   }