diff --git a/server/serverImpl.go b/server/serverImpl.go
index 8be12cc59677dae5a273f839b74be764a2369aff..5907a49d669c8328757599868fe3a7b19de2f021 100644
--- a/server/serverImpl.go
+++ b/server/serverImpl.go
@@ -24,6 +24,7 @@ import (
 	jww "github.com/spf13/jwalterweatherman"
 	"github.com/xx-labs/sleeve/wallet"
 	"gitlab.com/xx_network/crypto/signature/rsa"
+	"gitlab.com/xx_network/primitives/id"
 	"gitlab.com/xx_network/primitives/id/idf"
 	"net/http"
 	"testing"
@@ -133,6 +134,17 @@ func (i *Impl) Verify(_ context.Context, msg messages.Commitment) error {
 		return err
 	}
 
+	if idfStruct.HexNodeID == "" {
+		nid, err := id.Unmarshal(idfStruct.IdBytes[:])
+		if err != nil {
+			err = errors.WithMessage(err, "Failed to unmarshal ID")
+			jww.ERROR.Println(err)
+			return err
+		}
+
+		idfStruct.HexNodeID = nid.HexEncode()
+	}
+
 	// Get member info from database
 	hexId := "\\" + idfStruct.HexNodeID[1:]
 	m, err := i.s.GetMember(hexId)