diff --git a/src/Shared/INodePacket.cs b/src/Shared/INodePacket.cs
index 541a266d1b9..f455dc9aae5 100644
--- a/src/Shared/INodePacket.cs
+++ b/src/Shared/INodePacket.cs
@@ -329,7 +329,9 @@ internal static class NodePacketTypeExtensions
         /// <returns>True if extended header flag was set, false otherwise.</returns>
         public static bool TryCreateExtendedHeaderType(HandshakeOptions handshakeOptions, NodePacketType type, out byte extendedheader)
         {
-            if (Handshake.IsHandshakeOptionEnabled(handshakeOptions, HandshakeOptions.TaskHost))
+            // Extended headers are supported by all task hosts except CLR2.
+            if (Handshake.IsHandshakeOptionEnabled(handshakeOptions, HandshakeOptions.TaskHost)
+                && !Handshake.IsHandshakeOptionEnabled(handshakeOptions, HandshakeOptions.CLR2))
             {
                 extendedheader = (byte)((byte)type | ExtendedHeaderFlag);
                 return true;