diff --git a/common/shareddb.cpp b/common/shareddb.cpp
index 1a2f1d81f..b1527bffe 100644
--- a/common/shareddb.cpp
+++ b/common/shareddb.cpp
@@ -60,37 +60,19 @@ bool SharedDatabase::SetHideMe(uint32 account_id, uint8 hideme)
 
 uint8 SharedDatabase::GetGMSpeed(uint32 account_id)
 {
-	char errbuf[MYSQL_ERRMSG_SIZE];
-	char *query = 0;
-	MYSQL_RES *result;
-	MYSQL_ROW row;
-	if (RunQuery(query, MakeAnyLenString(&query, "SELECT gmspeed FROM account where id='%i'", account_id), errbuf, &result)) {
-		safe_delete_array(query);
-		if (mysql_num_rows(result) == 1)
-		{
-			row = mysql_fetch_row(result);
-			uint8 gmspeed = atoi(row[0]);
-			mysql_free_result(result);
-			return gmspeed;
-		}
-		else
-		{
-			mysql_free_result(result);
-			return 0;
-		}
-		mysql_free_result(result);
-	}
-	else
-	{
-
-		std::cerr << "Error in GetGMSpeed query '" << query << "' " << errbuf << std::endl;
-		safe_delete_array(query);
-		return false;
+	std::string query = StringFormat("SELECT gmspeed FROM account WHERE id = '%i'", account_id);
+	auto results = QueryDatabase(query);
+	if (!results.Success()) {
+		std::cerr << "Error in GetGMSpeed query '" << query << "' " << results.ErrorMessage() << std::endl;
+		return 0;
 	}
 
-	return 0;
+    if (results.RowCount() != 1)
+        return 0;
 
+    auto row = results.begin();
 
+	return atoi(row[0]);
 }
 
 bool SharedDatabase::SetGMSpeed(uint32 account_id, uint8 gmspeed)