diff --git a/RiotSwiftUI/Modules/Room/PollEditForm/View/PollEditForm.swift b/RiotSwiftUI/Modules/Room/PollEditForm/View/PollEditForm.swift
index 7ea906593..c92acd3fa 100644
--- a/RiotSwiftUI/Modules/Room/PollEditForm/View/PollEditForm.swift
+++ b/RiotSwiftUI/Modules/Room/PollEditForm/View/PollEditForm.swift
@@ -35,8 +35,7 @@ struct PollEditForm: View {
                 ScrollView {
                     VStack(alignment: .leading, spacing: 32.0) {
                         
-                        // Intentionally disabled until platform parity.
-                        // PollEditFormTypePicker(selectedType: $viewModel.type)
+                        PollEditFormTypePicker(selectedType: $viewModel.type)
                         
                         VStack(alignment: .leading, spacing: 16.0) {
                             Text(VectorL10n.pollEditFormPollQuestionOrTopic)
diff --git a/RiotSwiftUI/Modules/Room/TimelinePoll/Coordinator/TimelinePollCoordinator.swift b/RiotSwiftUI/Modules/Room/TimelinePoll/Coordinator/TimelinePollCoordinator.swift
index 9502a6205..699cfec60 100644
--- a/RiotSwiftUI/Modules/Room/TimelinePoll/Coordinator/TimelinePollCoordinator.swift
+++ b/RiotSwiftUI/Modules/Room/TimelinePoll/Coordinator/TimelinePollCoordinator.swift
@@ -96,8 +96,7 @@ final class TimelinePollCoordinator: Coordinator, Presentable, PollAggregatorDel
     }
     
     func canEditPoll() -> Bool {
-        return false // Intentionally disabled until platform parity.
-        // return pollAggregator.poll.isClosed == false && pollAggregator.poll.totalAnswerCount == 0
+        return pollAggregator.poll.isClosed == false && pollAggregator.poll.totalAnswerCount == 0
     }
     
     func endPoll() {
diff --git a/changelog.d/5114.change b/changelog.d/5114.change
index 694524c66..b2b42307b 100644
--- a/changelog.d/5114.change
+++ b/changelog.d/5114.change
@@ -1 +1 @@
-Added support for unstable poll prefixes.
\ No newline at end of file
+Enabled poll editing and undisclosed polls. Added support for unstable poll prefixes.
\ No newline at end of file