diff --git a/x/machine/keeper/msg_server_attest_machine.go b/x/machine/keeper/msg_server_attest_machine.go
index a13449a..b8fd34e 100644
--- a/x/machine/keeper/msg_server_attest_machine.go
+++ b/x/machine/keeper/msg_server_attest_machine.go
@@ -44,16 +44,13 @@ func (k msgServer) AttestMachine(goCtx context.Context, msg *types.MsgAttestMach
 		scheme := params.AssetRegistryScheme
 		domain := params.AssetRegistryDomain
 		path := params.AssetRegistryPath
-		util.TerminationWaitGroup.Add(1)
-		go func() {
-			defer util.TerminationWaitGroup.Done()
-			localErr := util.IssueMachineNFT(goCtx, msg.Machine, scheme, domain, path)
-			if localErr != nil {
-				util.GetAppLogger().Error(ctx, "Machine NFT issuance failed : "+localErr.Error())
-			} else {
-				util.GetAppLogger().Info(ctx, "Machine NFT issuance successful: "+msg.Machine.String())
-			}
-		}()
+		localErr := util.IssueMachineNFT(goCtx, msg.Machine, scheme, domain, path)
+		if localErr != nil {
+			util.GetAppLogger().Error(ctx, "Machine NFT issuance failed : "+localErr.Error())
+		} else {
+			util.GetAppLogger().Info(ctx, "Machine NFT issuance successful: "+msg.Machine.String())
+		}
+
 	} else {
 		util.GetAppLogger().Info(ctx, "Not block proposer: skipping Machine NFT issuance")
 	}