diff --git a/src/mod_mam_sql.erl b/src/mod_mam_sql.erl
index 7716d6ddf..a8dc566e6 100644
--- a/src/mod_mam_sql.erl
+++ b/src/mod_mam_sql.erl
@@ -410,7 +410,7 @@ make_sql_query(User, LServer, MAMQuery, RSM, ExtraUsernames) ->
 
     HostMatch = case ejabberd_sql:use_new_schema() of
 		    true ->
-			[<<" and server_host='", SServer, "'">>];
+			[<<" and server_host='", SServer/binary, "'">>];
 		    _ ->
 			<<"">>
 		end,