diff --git a/packages/at_secondary_server/lib/src/verb/handler/enroll_verb_handler.dart b/packages/at_secondary_server/lib/src/verb/handler/enroll_verb_handler.dart
index b64b5bf65..d74b98f36 100644
--- a/packages/at_secondary_server/lib/src/verb/handler/enroll_verb_handler.dart
+++ b/packages/at_secondary_server/lib/src/verb/handler/enroll_verb_handler.dart
@@ -249,9 +249,6 @@ class EnrollVerbHandler extends AbstractVerbHandler {
       final inboundConnectionMetadata =
           atConnection.metaData as InboundConnectionMetadata;
       inboundConnectionMetadata.enrollmentId = newEnrollmentId;
-      // Store default encryption private key and self encryption key(both encrypted)
-      // for future retrieval
-      await _storeEncryptionKeys(newEnrollmentId, enrollParams, currentAtSign);
       // store this apkam as default pkam public key for old clients
       // The keys with AT_PKAM_PUBLIC_KEY does not sync to client.
       await keyStore.put(AtConstants.atPkamPublicKey,
diff --git a/tests/at_functional_test/test/enroll_verb_test.dart b/tests/at_functional_test/test/enroll_verb_test.dart
index b097a6b19..17f6eb7b9 100644
--- a/tests/at_functional_test/test/enroll_verb_test.dart
+++ b/tests/at_functional_test/test/enroll_verb_test.dart
@@ -413,7 +413,6 @@ void main() {
 
       String selfKeyGetResponse = await socketConnection2
           .sendRequestToServer('keys:get:keyName:$selfKey');
-      print('selfKeyGetResponse: $selfKeyGetResponse');
       selfKeyGetResponse = selfKeyGetResponse.replaceFirst('data:', '');
       var selfKeyResponseJson = jsonDecode(selfKeyGetResponse);
       expect(selfKeyResponseJson['value'],
@@ -428,7 +427,6 @@ void main() {
       expect(privateKeyResponse.contains(privateKey), true);
       String privateKeyGetResponse = await socketConnection2
           .sendRequestToServer('keys:get:keyName:$privateKey');
-      print('**privateKeyGetResponse: $privateKeyGetResponse');
       privateKeyGetResponse = privateKeyGetResponse.replaceFirst('data:', '');
       var privateKeyResponseJson = jsonDecode(privateKeyGetResponse);
       expect(privateKeyResponseJson['value'],