diff --git a/keystore/key_store_service.cpp b/keystore/key_store_service.cpp
index 8a95257..c33a1d0 100644
--- a/keystore/key_store_service.cpp
+++ b/keystore/key_store_service.cpp
@@ -1163,7 +1163,9 @@
     // application should get an auth token using the handle before the
     // first call to update, which will fail if keystore hasn't received the
     // auth token.
-    result->resultCode = authResult;
+    if (result->resultCode == ErrorCode::OK) {
+        result->resultCode = authResult;
+    }
 
     // Other result fields were set in the begin operation's callback.
 }