diff --git a/src/Workspaces/Remote/Core/Serialization/MessagePackFormatters.cs b/src/Workspaces/Remote/Core/Serialization/MessagePackFormatters.cs
index 2b6fc006a647d..01b96bb28e8e7 100644
--- a/src/Workspaces/Remote/Core/Serialization/MessagePackFormatters.cs
+++ b/src/Workspaces/Remote/Core/Serialization/MessagePackFormatters.cs
@@ -26,6 +26,7 @@ internal sealed class MessagePackFormatters
     {
         internal static readonly ImmutableArray<IMessagePackFormatter> Formatters = ImmutableArray.Create<IMessagePackFormatter>(
             ProjectIdFormatter.Instance,
+            EncodingFormatter.Instance,
             // ForceTypelessFormatter<T> needs to be listed here for each Roslyn abstract type T that is being serialized OOP.
             // TODO: add a resolver that provides these https://github.com/dotnet/roslyn/issues/60724
             new ForceTypelessFormatter<SimplifierOptions>(),
@@ -34,8 +35,7 @@ internal sealed class MessagePackFormatters
             new ForceTypelessFormatter<IdeCodeStyleOptions>());
 
         private static readonly ImmutableArray<IFormatterResolver> s_resolvers = ImmutableArray.Create<IFormatterResolver>(
-            StandardResolverAllowPrivate.Instance,
-            EncodingResolver.Instance);
+            StandardResolverAllowPrivate.Instance);
 
         internal static readonly IFormatterResolver DefaultResolver = CompositeResolver.Create(Formatters, s_resolvers);
 
@@ -111,21 +111,15 @@ public void Serialize(ref MessagePackWriter writer, ProjectId? value, MessagePac
             }
         }
 
-        /// <summary>
-        /// Creates formatter for <see cref="Encoding"/> serialization.
-        /// </summary>
-        internal sealed class EncodingResolver : IFormatterResolver
-        {
-            public static readonly EncodingResolver Instance = new();
-
-            public IMessagePackFormatter<T>? GetFormatter<T>()
-                => typeof(T) == typeof(Encoding) ? (IMessagePackFormatter<T>)(object)EncodingFormatter.Instance : null;
-        }
-
         /// <summary>
         /// Supports (de)serialization of <see cref="Encoding"/> that do not customize <see cref="Encoding.EncoderFallback"/> or <see cref="Encoding.DecoderFallback"/>.
         /// The fallback will be discarded if the <see cref="Encoding"/> has any.
         /// </summary>
+        /// <remarks>
+        /// Only supports (de)serializing values that are statically typed to <see cref="Encoding"/>.
+        /// This is important as we can't assume anything about arbitrary subtypes of <see cref="Encoding"/>
+        /// and can only return general <see cref="Encoding"/> from the deserializer.
+        /// </remarks>
         internal sealed class EncodingFormatter : IMessagePackFormatter<Encoding?>
         {
             public static readonly EncodingFormatter Instance = new();