diff --git a/pubsub.go b/pubsub.go
index 0f1c382d5..04bc57021 100644
--- a/pubsub.go
+++ b/pubsub.go
@@ -47,11 +47,7 @@ func (s *PubSubSubscription) Next() (*Message, error) {
 
 	// fields are wrapped in multibase when sent over HTTP RPC
 	// and need to be decoded (https://github.com/ipfs/go-ipfs/pull/8183)
-	_, bfrom, err := mbase.Decode(r.From)
-	if err != nil {
-		return nil, err
-	}
-	from, err := peer.IDFromBytes(bfrom)
+	from, err := peer.Decode(r.From)
 	if err != nil {
 		return nil, err
 	}