diff --git a/src/screens/Tabs/Me/Push.tsx b/src/screens/Tabs/Me/Push.tsx
index 09c512bf..cf21c506 100644
--- a/src/screens/Tabs/Me/Push.tsx
+++ b/src/screens/Tabs/Me/Push.tsx
@@ -182,7 +182,7 @@ const TabMePush: React.FC = () => {
                     } else {
                       // Fix a bug for some users of v4.8.0
                       let authKey = push.key
-                      if (push.key.length <= 10) {
+                      if (push.key?.length <= 10) {
                         authKey = fromByteArray(Random.getRandomBytes(16))
                       }
                       // Turning on
@@ -228,7 +228,7 @@ const TabMePush: React.FC = () => {
                         body: {
                           accountFull,
                           serverKey: res.body.server_key,
-                          auth: push.decode === false ? null : push.key
+                          auth: push.decode === false ? null : authKey
                         }
                       })