diff --git a/packages/cli/src/CredentialsOverwrites.ts b/packages/cli/src/CredentialsOverwrites.ts
index ca09b87626..40b6419dab 100644
--- a/packages/cli/src/CredentialsOverwrites.ts
+++ b/packages/cli/src/CredentialsOverwrites.ts
@@ -38,7 +38,12 @@ class CredentialsOverwritesClass {
 		}
 
 		const returnData = JSON.parse(JSON.stringify(data));
-		Object.assign(returnData, overwrites);
+		// Overwrite only if there is currently no data set
+		for (const key of Object.keys(overwrites)) {
+			if ([null, undefined, ''].includes(returnData[key])) {
+				returnData[key] = overwrites[key];
+			}
+		}
 
 		return returnData;
 	}