diff --git a/commands.go b/commands.go
index b0d4b95..7ba89ce 100644
--- a/commands.go
+++ b/commands.go
@@ -380,7 +380,7 @@ func fnCreate(ce *WrappedCommandEvent) {
 	}
 	// TODO check m.space.parent to create rooms directly in communities
 
-	messageID := whatsmeow.GenerateMessageID()
+	messageID := ce.User.Client.GenerateMessageID()
 	ce.Log.Infofln("Creating group for %s with name %s and participants %+v (create key: %s)", ce.RoomID, roomNameEvent.Name, participants, messageID)
 	ce.User.createKeyDedup = messageID
 	resp, err := ce.User.Client.CreateGroup(whatsmeow.ReqCreateGroup{
diff --git a/portal.go b/portal.go
index 96d3db6..93cc53f 100644
--- a/portal.go
+++ b/portal.go
@@ -4108,7 +4108,7 @@ func (portal *Portal) convertMatrixMessage(ctx context.Context, sender *User, ev
 
 func (portal *Portal) generateMessageInfo(sender *User) *types.MessageInfo {
 	return &types.MessageInfo{
-		ID:        whatsmeow.GenerateMessageID(),
+		ID:        sender.Client.GenerateMessageID(),
 		Timestamp: time.Now(),
 		MessageSource: types.MessageSource{
 			Sender:   sender.JID,
diff --git a/user.go b/user.go
index c10ff9f..5ccfbe5 100644
--- a/user.go
+++ b/user.go
@@ -677,7 +677,7 @@ const PhoneMinPingInterval = 24 * time.Hour
 
 func (user *User) sendHackyPhonePing() {
 	user.PhoneLastPinged = time.Now()
-	msgID := whatsmeow.GenerateMessageID()
+	msgID := user.Client.GenerateMessageID()
 	keyIDs := make([]*waProto.AppStateSyncKeyId, 0, 1)
 	lastKeyID, err := user.GetLastAppStateKeyID()
 	if lastKeyID != nil {