diff --git a/aws-android-sdk-mobile-client/src/main/java/com/amazonaws/mobile/client/AWSMobileClient.java b/aws-android-sdk-mobile-client/src/main/java/com/amazonaws/mobile/client/AWSMobileClient.java
index 6a6365c997d..b417dbc2e1a 100644
--- a/aws-android-sdk-mobile-client/src/main/java/com/amazonaws/mobile/client/AWSMobileClient.java
+++ b/aws-android-sdk-mobile-client/src/main/java/com/amazonaws/mobile/client/AWSMobileClient.java
@@ -1129,6 +1129,7 @@ private Runnable _signIn(final String username,
 
         this.signInCallback = callback;
         signInState = null;
+        mStore.set(SIGN_IN_MODE, SignInMode.SIGN_IN.toString());
 
         return new Runnable() {
             @Override
@@ -1594,6 +1595,8 @@ private Runnable _federatedSignIn(final String providerKey,
                                       final boolean assignState) {
 
         final Map<String, String> loginsMap = new HashMap<String, String>();
+        mStore.set(SIGN_IN_MODE, SignInMode.FEDERATED_SIGN_IN.toString());
+
         try {
             loginsMap.put(providerKey, token);