diff --git a/packages/at_auth/lib/src/at_auth_impl.dart b/packages/at_auth/lib/src/at_auth_impl.dart
index 0df0b46f..913e5ee2 100644
--- a/packages/at_auth/lib/src/at_auth_impl.dart
+++ b/packages/at_auth/lib/src/at_auth_impl.dart
@@ -51,7 +51,7 @@ class AtAuthImpl implements AtAuth {
     if (atAuthRequest.atKeysFilePath != null) {
       atAuthKeys = await _prepareAtAuthKeysFromFilePath(atAuthRequest);
     } else if (atAuthRequest.encryptedKeysMap != null) {
-      atAuthKeys = await _decryptAtKeysWithSelfEncKey(
+      atAuthKeys = _decryptAtKeysWithSelfEncKey(
           atAuthRequest.encryptedKeysMap!, PkamAuthMode.keysFile);
     } else {
       atAuthKeys = atAuthRequest.atAuthKeys;
diff --git a/packages/at_auth/lib/src/enroll/at_enrollment_impl.dart b/packages/at_auth/lib/src/enroll/at_enrollment_impl.dart
index 2ecd6931..05dbf3b4 100644
--- a/packages/at_auth/lib/src/enroll/at_enrollment_impl.dart
+++ b/packages/at_auth/lib/src/enroll/at_enrollment_impl.dart
@@ -124,14 +124,14 @@ class AtEnrollmentImpl implements AtEnrollmentBase {
             EncryptionKeyType.aes256,
             keyName: 'apkamSymmetricKey',
             iv: AtChopsUtil.generateIVLegacy())
-        ?.result;
+        .result;
 
     // Fetch the selfEncryptionKey from the atChops and encrypt with APKAM Symmetric key.
     String encryptedDefaultSelfEncryptionKey = atLookUp.atChops
         ?.encryptString(atLookUp.atChops!.atChopsKeys.selfEncryptionKey!.key,
             EncryptionKeyType.aes256,
             keyName: 'apkamSymmetricKey', iv: AtChopsUtil.generateIVLegacy())
-        ?.result;
+        .result;
 
     String command = 'enroll:approve:${jsonEncode({
           'enrollmentId': enrollmentRequestDecision.enrollmentId,