diff --git a/CodePush.m b/CodePush.m
index 193fdbb..216c7a8 100644
--- a/CodePush.m
+++ b/CodePush.m
@@ -506,7 +506,10 @@ RCT_EXPORT_METHOD(isFirstRun:(NSString *)packageHash
 RCT_EXPORT_METHOD(notifyApplicationReady:(RCTPromiseResolveBlock)resolve
                                 rejecter:(RCTPromiseRejectBlock)reject)
 {
-    [CodePush removePendingUpdate];
+    if (_isFirstRunAfterUpdate) {
+        [CodePush removePendingUpdate];
+    }
+    
     resolve(nil);
 }
 
diff --git a/android/app/src/main/java/com/microsoft/codepush/react/CodePush.java b/android/app/src/main/java/com/microsoft/codepush/react/CodePush.java
index 8d07647..4825d3b 100644
--- a/android/app/src/main/java/com/microsoft/codepush/react/CodePush.java
+++ b/android/app/src/main/java/com/microsoft/codepush/react/CodePush.java
@@ -539,7 +539,10 @@ public class CodePush {
 
         @ReactMethod
         public void notifyApplicationReady(Promise promise) {
-            removePendingUpdate();
+            if (didUpdate) {
+                removePendingUpdate();
+            }
+            
             promise.resolve("");
         }