diff --git a/javascript/src/iframe/viamapi-iframe.js b/javascript/src/iframe/viamapi-iframe.js
index 192a27f9878d9aae83344b2f26299fae7b285604..ab4f8b6e9becd302e822742d4066312f1dd5246e 100644
--- a/javascript/src/iframe/viamapi-iframe.js
+++ b/javascript/src/iframe/viamapi-iframe.js
@@ -612,29 +612,13 @@ const connection = Penpal.connectToParent({
     },
     identityPullAvatarFromGravatar: async () => {
       const authenticationPublicKey = localStorage.getItem("authenticatedIdentity");
-      if (authenticationPublicKey === null) {
-        return {
-          data : "",
-          code : "400",
-          status : "Identity not authenticated"
-        };
-      }
-      if (window.loadedIdentities[authenticationPublicKey] === null) {
-        return {
-          data : "",
-          code : "400",
-          status : "Identity not authenticated"
-        }
-      }
 
-      var success = extendPinCodeTtl(authenticationPublicKey);
-
-      if(success === false) {
-        return {
-          data : "",
-          code : "400",
-          status : "Identity not authenticated"
-        };
+      if (
+        !authenticationPublicKey ||
+        !window.loadedIdentities[authenticationPublicKey] ||
+        !extendPinCodeTtl(authenticationPublicKey)
+      ) {
+        return encodeResponse("400", "", "Identity not authenticated");
       }
 
       return await executeRestfulFunction("private", viamApi, viamApi.identityPullAvatarFromGravatar);