diff --git a/setup/inc/class.setup.inc.php b/setup/inc/class.setup.inc.php
index c5109407e9..ed05fc3ecf 100644
--- a/setup/inc/class.setup.inc.php
+++ b/setup/inc/class.setup.inc.php
@@ -145,7 +145,8 @@ class setup
 					}
 					if (!$api_version || !$this->alessthanb($api_version,'1.0.1.019'))
 					{
-						$this->db->Link_ID->SetCharSet($this->system_charset);
+						$this->db->Link_ID->SetCharSet($this->system_charset === 'utf-8' &&
+							$this->db->Type === 'mysql' ? 'utf8' : $this->system_charset);
 					}
 				}
 			}
@@ -1293,4 +1294,4 @@ class setup
 			//echo "<p>setup::set_table_names: $name = '{$this->$name}'</p>\n";
 		}
 	}
-}
+}
\ No newline at end of file