diff --git a/RiotSwiftUI/Modules/Room/PollEditForm/Coordinator/PollEditFormCoordinator.swift b/RiotSwiftUI/Modules/Room/PollEditForm/Coordinator/PollEditFormCoordinator.swift
index 2878648c8..a3fa803e2 100644
--- a/RiotSwiftUI/Modules/Room/PollEditForm/Coordinator/PollEditFormCoordinator.swift
+++ b/RiotSwiftUI/Modules/Room/PollEditForm/Coordinator/PollEditFormCoordinator.swift
@@ -146,15 +146,17 @@ final class PollEditFormCoordinator: Coordinator, Presentable {
     }
     
     private static func pollDetailsTypeToKindKey(_ type: EditFormPollType) -> String {
-        let mapping = [EditFormPollType.disclosed : kMXMessageContentKeyExtensiblePollKindDisclosed,
-                       EditFormPollType.undisclosed : kMXMessageContentKeyExtensiblePollKindUndisclosed]
+        let mapping = [EditFormPollType.disclosed : kMXMessageContentKeyExtensiblePollKindDisclosedMSC3381,
+                       EditFormPollType.undisclosed : kMXMessageContentKeyExtensiblePollKindUndisclosedMSC3381]
         
-        return mapping[type] ?? kMXMessageContentKeyExtensiblePollKindDisclosed
+        return mapping[type] ?? kMXMessageContentKeyExtensiblePollKindDisclosedMSC3381
     }
     
     private static func pollKindKeyToDetailsType(_ key: String) -> EditFormPollType {
         let mapping = [kMXMessageContentKeyExtensiblePollKindDisclosed : EditFormPollType.disclosed,
-                       kMXMessageContentKeyExtensiblePollKindUndisclosed : EditFormPollType.undisclosed]
+                       kMXMessageContentKeyExtensiblePollKindDisclosedMSC3381 : EditFormPollType.disclosed,
+                       kMXMessageContentKeyExtensiblePollKindUndisclosed : EditFormPollType.undisclosed,
+                     kMXMessageContentKeyExtensiblePollKindUndisclosedMSC3381 : EditFormPollType.undisclosed]
         
         return mapping[key] ?? EditFormPollType.disclosed
     }
diff --git a/changelog.d/5114.change b/changelog.d/5114.change
new file mode 100644
index 000000000..694524c66
--- /dev/null
+++ b/changelog.d/5114.change
@@ -0,0 +1 @@
+Added support for unstable poll prefixes.
\ No newline at end of file