diff --git a/UC/src/network/socket_communicator/tcp_server_communicator.ts b/UC/src/network/socket_communicator/tcp_server_communicator.ts
index 5bf5220..61840ef 100644
--- a/UC/src/network/socket_communicator/tcp_server_communicator.ts
+++ b/UC/src/network/socket_communicator/tcp_server_communicator.ts
@@ -136,9 +136,16 @@ export class TcpServerCommunicator extends SocketCommunicatorBase {
         const message = MessageHandler.formatMessage(operationCode, metaInfo, fileContent);
         let outgoingMessage: string;
 
-        if (this.aesKey && this.aesIv) outgoingMessage = this.encryptWithAes(message);
-        else if(this.privateKey) outgoingMessage = this.encryptWithRsa(message);
-        else outgoingMessage = message;
+        switch(operationCode) {
+            case 'SET_PUBLIC_KEY':
+                outgoingMessage = message;
+                break;
+            case 'SET_AES_KEY':
+                outgoingMessage = this.encryptWithRsa(message);
+                break;
+            default:
+                outgoingMessage = this.encryptWithAes(message);
+        }
 
         const totalChunks = Math.ceil(outgoingMessage.length / CHUNK_SIZE);
         const messageId = Date.now().toString();
diff --git a/User/src/network/socket_communicator/tcp_client_communicator.ts b/User/src/network/socket_communicator/tcp_client_communicator.ts
index 91920c0..6bf2aa2 100644
--- a/User/src/network/socket_communicator/tcp_client_communicator.ts
+++ b/User/src/network/socket_communicator/tcp_client_communicator.ts
@@ -78,13 +78,7 @@ export class TcpClientCommunicator extends SocketCommunicatorBase {
 
     async sendChunkedMessage(operationCode: string, metaInfo?: { [key: string]: any }, fileContent?: Buffer): Promise<void> {
         const message = MessageHandler.formatMessage(operationCode, metaInfo, fileContent);
-        let outgoingMessage: string;
-
-        if (this.aesKey && this.aesIv) {
-            outgoingMessage = this.encryptWithAes(message);
-        } else {
-            outgoingMessage = message;
-        }
+        const outgoingMessage = this.encryptWithAes(message);
 
         const totalChunks = Math.ceil(outgoingMessage.length / CHUNK_SIZE);
         const messageId = Date.now().toString();
diff --git a/User/src/network/socket_communicator/tcp_server_communicator.ts b/User/src/network/socket_communicator/tcp_server_communicator.ts
index 5bf5220..61840ef 100644
--- a/User/src/network/socket_communicator/tcp_server_communicator.ts
+++ b/User/src/network/socket_communicator/tcp_server_communicator.ts
@@ -136,9 +136,16 @@ export class TcpServerCommunicator extends SocketCommunicatorBase {
         const message = MessageHandler.formatMessage(operationCode, metaInfo, fileContent);
         let outgoingMessage: string;
 
-        if (this.aesKey && this.aesIv) outgoingMessage = this.encryptWithAes(message);
-        else if(this.privateKey) outgoingMessage = this.encryptWithRsa(message);
-        else outgoingMessage = message;
+        switch(operationCode) {
+            case 'SET_PUBLIC_KEY':
+                outgoingMessage = message;
+                break;
+            case 'SET_AES_KEY':
+                outgoingMessage = this.encryptWithRsa(message);
+                break;
+            default:
+                outgoingMessage = this.encryptWithAes(message);
+        }
 
         const totalChunks = Math.ceil(outgoingMessage.length / CHUNK_SIZE);
         const messageId = Date.now().toString();