diff --git a/encoding/jsonpb/encode.go b/encoding/jsonpb/encode.go
index 8cb66e6c..2d2d626e 100644
--- a/encoding/jsonpb/encode.go
+++ b/encoding/jsonpb/encode.go
@@ -15,8 +15,6 @@ import (
 	"github.com/golang/protobuf/v2/proto"
 	pref "github.com/golang/protobuf/v2/reflect/protoreflect"
 	"github.com/golang/protobuf/v2/reflect/protoregistry"
-
-	descpb "github.com/golang/protobuf/v2/types/descriptor"
 )
 
 // Marshal writes the given proto.Message in JSON format using default options.
@@ -337,13 +335,6 @@ func isMessageSetExtension(xt pref.ExtensionType) bool {
 	if xt.FullName().Parent() != mt.FullName() {
 		return false
 	}
-	xmt := xt.ExtendedType()
-	if xmt.Fields().Len() != 0 {
-		return false
-	}
-	opt := xmt.Options().(*descpb.MessageOptions)
-	if opt == nil {
-		return false
-	}
-	return opt.GetMessageSetWireFormat()
+	xmt, ok := xt.ExtendedType().(interface{ IsMessageSet() bool })
+	return ok && xmt.IsMessageSet()
 }