diff --git a/x/cheqd/genesis.go b/x/cheqd/genesis.go
index 50024476a..9d631595b 100644
--- a/x/cheqd/genesis.go
+++ b/x/cheqd/genesis.go
@@ -11,16 +11,15 @@ import (
 // InitGenesis initializes the cheqd module's state from a provided genesis
 // state.
 func InitGenesis(ctx sdk.Context, k keeper.Keeper, genState types.GenesisState) {
+	// Set did namespace
+	ctx.Logger().Info("Setting did namespace to: " + genState.DidNamespace)
+	k.SetDidNamespace(&ctx, genState.DidNamespace)
+
 	for _, elem := range genState.DidList {
 		if err := k.SetDid(&ctx, elem); err != nil {
 			panic(fmt.Sprintf("Cannot set did case: %s", err.Error()))
 		}
 	}
-
-	// Set nym count
-	k.SetDidCount(&ctx, uint64(len(genState.DidList)))
-
-	k.SetDidNamespace(&ctx, genState.DidNamespace)
 }
 
 // ExportGenesis returns the cheqd module's exported genesis.
diff --git a/x/cheqd/types/genesis.go b/x/cheqd/types/genesis.go
index e6a9b11df..2b97cc8a4 100644
--- a/x/cheqd/types/genesis.go
+++ b/x/cheqd/types/genesis.go
@@ -2,6 +2,8 @@ package types
 
 import (
 	"fmt"
+
+	"github.com/cosmos/cosmos-sdk/codec/types"
 )
 
 const DefaultDidNamespace = "testnet"
@@ -14,6 +16,16 @@ func DefaultGenesis() *GenesisState {
 	}
 }
 
+func (gs *GenesisState) UnpackInterfaces(unpacker types.AnyUnpacker) error {
+	for _, elem := range gs.DidList {
+		err := elem.UnpackInterfaces(unpacker)
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
 // Validate performs basic genesis state validation returning an error upon any
 // failure.
 func (gs GenesisState) Validate() error {