diff --git a/src/FirebirdSql.Data.FirebirdClient/Common/Extensions.cs b/src/FirebirdSql.Data.FirebirdClient/Common/Extensions.cs
index b3d5d4327..39bcbd91b 100644
--- a/src/FirebirdSql.Data.FirebirdClient/Common/Extensions.cs
+++ b/src/FirebirdSql.Data.FirebirdClient/Common/Extensions.cs
@@ -48,7 +48,11 @@ public static IntPtr ReadIntPtr(this BinaryReader self)
 
 	public static string ToHexString(this byte[] b)
 	{
+#if NET5_0_OR_GREATER
+		return Convert.ToHexString(b);
+#else
 		return BitConverter.ToString(b).Replace("-", string.Empty);
+#endif
 	}
 
 	public static IEnumerable<IEnumerable<T>> Split<T>(this T[] array, int size)