diff --git a/backend-api/src/connection/connection.service.ts b/backend-api/src/connection/connection.service.ts
index 2b45f37..503bf6e 100644
--- a/backend-api/src/connection/connection.service.ts
+++ b/backend-api/src/connection/connection.service.ts
@@ -64,20 +64,22 @@ export class ConnectionService {
    * @param createDatabaseDto
    */
   async testConnection(createDatabaseDto: CreateDatabaseDto) {
-    const connectioninfo = createDatabaseDto.connectionConfig;
-    const url = `postgresql://${connectioninfo['user']}:${connectioninfo['password']}@${connectioninfo['host']}:${connectioninfo['port']}/${connectioninfo['database']}?sslmode=verify-full&options=--cluster%3Dvanillameta-cockroach-3010`
+
 
     const engine =
       createDatabaseDto.engine === 'bigquery' ? BigQueryClient : createDatabaseDto.engine;
 
-    createDatabaseDto.engine === 'cockroachdb' ? connectioninfo['connectionString'] = url : createDatabaseDto
+    if(createDatabaseDto.engine === 'cockroachdb') {
+      const connectioninfo = createDatabaseDto.connectionConfig;
+      const cockroach_url = `postgresql://${connectioninfo['user']}:${connectioninfo['password']}@${connectioninfo['host']}:${connectioninfo['port']}/${connectioninfo['database']}?sslmode=verify-full&options=--cluster%3Dvanillameta-cockroach-3010`
+      connectioninfo['connectionString'] = cockroach_url
+    }
 
     const connectionConfig = {
       client: engine,
       connection: createDatabaseDto.connectionConfig,
       useNullAsDefault: true,
     };
-    console.log(connectionConfig)
 
     // createDatabaseDto.connectionConfig = JSON.stringify(connectionConfig);
     // console.log(createDatabaseDto)
diff --git a/backend-api/src/database/database.service.ts b/backend-api/src/database/database.service.ts
index d6b0c7a..d826ca6 100644
--- a/backend-api/src/database/database.service.ts
+++ b/backend-api/src/database/database.service.ts
@@ -36,9 +36,12 @@ export class DatabaseService {
    * @param createDatabaseDto
    */
   async create(createDatabaseDto: CreateDatabaseDto) {
-    const connectioninfo = createDatabaseDto.connectionConfig;
-    const url = `postgresql://${connectioninfo['user']}:${connectioninfo['password']}@${connectioninfo['host']}:${connectioninfo['port']}/${connectioninfo['database']}?sslmode=verify-full&options=--cluster%3Dvanillameta-cockroach-3010`
-    createDatabaseDto.engine === 'cockroachdb' ? connectioninfo['connectionString'] = url : createDatabaseDto
+
+    if(createDatabaseDto.engine === 'cockroachdb') {
+      const connectioninfo = createDatabaseDto.connectionConfig;
+      const cockroach_url = `postgresql://${connectioninfo['user']}:${connectioninfo['password']}@${connectioninfo['host']}:${connectioninfo['port']}/${connectioninfo['database']}?sslmode=verify-full&options=--cluster%3Dvanillameta-cockroach-3010`
+      connectioninfo['connectionString'] = cockroach_url
+    }
     const databaseDto = Database.toDto(createDatabaseDto);
 
     const connectionConfig = {