diff --git a/cmd/cgr-loader/cgr-loader.go b/cmd/cgr-loader/cgr-loader.go
index 745c78fd7..920012514 100755
--- a/cmd/cgr-loader/cgr-loader.go
+++ b/cmd/cgr-loader/cgr-loader.go
@@ -81,30 +81,25 @@ func main() {
 	var rater, cdrstats, users rpcclient.RpcClientConnection
 	var loader engine.LoadReader
 
+	dm, errDataDB = engine.ConfigureDataStorage(*datadb_type, *datadb_host, *datadb_port, *datadb_name, *datadb_user, *datadb_pass, *dbdata_encoding, config.CgrConfig().CacheConfig, *loadHistorySize)
+	if *fromStorDb || *toStorDb {
+		storDb, errStorDb = engine.ConfigureLoadStorage(*stor_db_type, *stor_db_host, *stor_db_port, *stor_db_name, *stor_db_user, *stor_db_pass, *dbdata_encoding,
+			config.CgrConfig().StorDBMaxOpenConns, config.CgrConfig().StorDBMaxIdleConns, config.CgrConfig().StorDBConnMaxLifetime, config.CgrConfig().StorDBCDRSIndexes)
+	}
+	// Stop on db errors
+	for _, err = range []error{errDataDB, errDataDB, errStorDb} {
+		if err != nil {
+			log.Fatalf("Could not open database connection: %v", err)
+		}
+	}
+	// Defer databases opened to be closed when we are done
+	for _, db := range []engine.Storage{dm.DataDB(), storDb} {
+		if db != nil {
+			defer db.Close()
+		}
+	}
 	// Init necessary db connections, only if not already
 	if !*dryRun { // make sure we do not need db connections on dry run, also not importing into any stordb
-		if *fromStorDb {
-			dm, errDataDB = engine.ConfigureDataStorage(*datadb_type, *datadb_host, *datadb_port, *datadb_name, *datadb_user, *datadb_pass, *dbdata_encoding, config.CgrConfig().CacheConfig, *loadHistorySize)
-			storDb, errStorDb = engine.ConfigureLoadStorage(*stor_db_type, *stor_db_host, *stor_db_port, *stor_db_name, *stor_db_user, *stor_db_pass, *dbdata_encoding,
-				config.CgrConfig().StorDBMaxOpenConns, config.CgrConfig().StorDBMaxIdleConns, config.CgrConfig().StorDBConnMaxLifetime, config.CgrConfig().StorDBCDRSIndexes)
-		} else if *toStorDb { // Import from csv files to storDb
-			storDb, errStorDb = engine.ConfigureLoadStorage(*stor_db_type, *stor_db_host, *stor_db_port, *stor_db_name, *stor_db_user, *stor_db_pass, *dbdata_encoding,
-				config.CgrConfig().StorDBMaxOpenConns, config.CgrConfig().StorDBMaxIdleConns, config.CgrConfig().StorDBConnMaxLifetime, config.CgrConfig().StorDBCDRSIndexes)
-		} else { // Default load from csv files to dataDb
-			dm, errDataDB = engine.ConfigureDataStorage(*datadb_type, *datadb_host, *datadb_port, *datadb_name, *datadb_user, *datadb_pass, *dbdata_encoding, config.CgrConfig().CacheConfig, *loadHistorySize)
-		}
-		// Stop on db errors
-		for _, err = range []error{errDataDB, errDataDB, errStorDb} {
-			if err != nil {
-				log.Fatalf("Could not open database connection: %v", err)
-			}
-		}
-		// Defer databases opened to be closed when we are done
-		for _, db := range []engine.Storage{dm.DataDB(), storDb} {
-			if db != nil {
-				defer db.Close()
-			}
-		}
 		if *toStorDb { // Import files from a directory into storDb
 			if *tpid == "" {
 				log.Fatal("TPid required, please define it via *-tpid* command argument.")