diff --git a/htdocs/lib/databases/mysql.lib.php b/htdocs/lib/databases/mysql.lib.php
index b01a908082a..40359da87ec 100644
--- a/htdocs/lib/databases/mysql.lib.php
+++ b/htdocs/lib/databases/mysql.lib.php
@@ -132,8 +132,12 @@ class DoliDb
 	    	$this->db_user=$dolibarr_main_db_user;
 		}
 		*/
-		$this->forcecharset=$conf->character_set_client;
-	    $this->forcecollate=$conf->collation_connection;
+		if ($conf->db->character_set  && $conf->db->character_set != null && $conf->db->character_set !=""){
+			$this->forcecharset=$conf->db->character_set;
+  		}
+  		if ($conf->db->collation_connection  && $conf->db->collation_connection != null && $conf->db->collation_connection !=""){
+	    	$this->forcecollate=$conf->db->collation_connection;
+  		}
 	    $this->db_user=$conf->db->user;
 
 		$this->transaction_opened=0;
diff --git a/htdocs/lib/databases/mysqli.lib.php b/htdocs/lib/databases/mysqli.lib.php
index 42317e16306..57dfa108fd3 100644
--- a/htdocs/lib/databases/mysqli.lib.php
+++ b/htdocs/lib/databases/mysqli.lib.php
@@ -131,8 +131,12 @@ class DoliDb
 	    	$this->db_user=$dolibarr_main_db_user;
 		}
 		*/
-		$this->forcecharset=$conf->db->character_set;
-	    $this->forcecollate=$conf->db->collation_connection;
+		if ($conf->db->character_set  && $conf->db->character_set != null && $conf->db->character_set !=""){
+			$this->forcecharset=$conf->db->character_set;
+  		}
+  		if ($conf->db->collation_connection  && $conf->db->collation_connection != null && $conf->db->collation_connection !=""){
+	    	$this->forcecollate=$conf->db->collation_connection;
+  		}
 	    $this->db_user=$conf->db->user;
 
         $this->transaction_opened=0;