diff --git a/packages/backend/src/models/connection.ts b/packages/backend/src/models/connection.ts
index f4a0f5a2..a3081f9a 100644
--- a/packages/backend/src/models/connection.ts
+++ b/packages/backend/src/models/connection.ts
@@ -39,13 +39,19 @@ class Connection extends Base {
   })
 
   encryptData() {
+    if(!this.eligibleForEncryption()) return;
     this.data = AES.encrypt(JSON.stringify(this.data), appConfig.encryptionKey).toString();
   }
 
   decryptData() {
+    if(!this.eligibleForEncryption()) return;
     this.data = JSON.parse(AES.decrypt(this.data, appConfig.encryptionKey).toString(enc.Utf8));
   }
 
+  eligibleForEncryption() {
+    return this.data ? true : false
+  }
+
   // TODO: Make another abstraction like beforeSave instead of using
   // beforeInsert and beforeUpdate separately for the same operation.
   async $beforeInsert(queryContext: QueryContext) {