diff --git a/pkg/connector/wamsgtype.go b/pkg/connector/wamsgtype.go
index 0a29b82..4bcf483 100644
--- a/pkg/connector/wamsgtype.go
+++ b/pkg/connector/wamsgtype.go
@@ -67,11 +67,10 @@ func getMessageType(waMsg *waE2E.Message) string {
 		return "encrypted comment"
 	case waMsg.CommentMessage != nil:
 		return "comment"
-	case waMsg.PollCreationMessage != nil || waMsg.PollCreationMessageV2 != nil || waMsg.PollCreationMessageV3 != nil ||
-		waMsg.PollCreationMessageV5 != nil || waMsg.PollCreationMessageV6 != nil:
+	case waMsg.PollCreationMessage != nil || waMsg.PollCreationMessageV2 != nil || waMsg.PollCreationMessageV3 != nil:
 		return "poll create"
-	case waMsg.PollCreationMessageV4 != nil:
-		return "poll create (v4)"
+	case waMsg.PollCreationMessageV4 != nil || waMsg.PollCreationMessageV5 != nil:
+		return "poll create (vNext)"
 	case waMsg.PollUpdateMessage != nil:
 		return "poll update"
 	case waMsg.ProtocolMessage != nil:
diff --git a/pkg/msgconv/from-whatsapp.go b/pkg/msgconv/from-whatsapp.go
index e8cb032..6eea25f 100644
--- a/pkg/msgconv/from-whatsapp.go
+++ b/pkg/msgconv/from-whatsapp.go
@@ -176,12 +176,6 @@ func (mc *MessageConverter) ToMatrix(
 		part, contextInfo = mc.convertPollCreationMessage(ctx, waMsg.PollCreationMessageV2)
 	case waMsg.PollCreationMessageV3 != nil:
 		part, contextInfo = mc.convertPollCreationMessage(ctx, waMsg.PollCreationMessageV3)
-	//case waMsg.PollCreationMessageV4 != nil:
-	//	part, contextInfo = mc.convertPollCreationMessage(ctx, waMsg.PollCreationMessageV4)
-	case waMsg.PollCreationMessageV5 != nil:
-		part, contextInfo = mc.convertPollCreationMessage(ctx, waMsg.PollCreationMessageV5)
-	case waMsg.PollCreationMessageV6 != nil:
-		part, contextInfo = mc.convertPollCreationMessage(ctx, waMsg.PollCreationMessageV6)
 	case waMsg.PollUpdateMessage != nil:
 		part, contextInfo = mc.convertPollUpdateMessage(ctx, info, origSource, waMsg.PollUpdateMessage)
 	case waMsg.EventMessage != nil: