diff --git a/RiotSwiftUI/Modules/Room/PollHistory/View/SegmentedPicker.swift b/RiotSwiftUI/Modules/Room/PollHistory/View/SegmentedPicker.swift
index 520a649c7..14b53d644 100644
--- a/RiotSwiftUI/Modules/Room/PollHistory/View/SegmentedPicker.swift
+++ b/RiotSwiftUI/Modules/Room/PollHistory/View/SegmentedPicker.swift
@@ -39,7 +39,7 @@ struct SegmentedPicker<Segment: Hashable & CustomStringConvertible>: View {
                 } label: {
                     Text(segment.description)
                         .font(isSelectedSegment ? theme.fonts.headline : theme.fonts.body)
-                        .underline(isSelectedSegment)
+                        .underlineBar(isSelectedSegment)
                 }
                 .accentColor(isSelectedSegment ? theme.colors.accent : theme.colors.primaryContent)
                 .accessibilityLabel(segment.description)
@@ -49,6 +49,23 @@ struct SegmentedPicker<Segment: Hashable & CustomStringConvertible>: View {
     }
 }
 
+private extension Text {
+    @ViewBuilder
+    func underlineBar(_ isActive: Bool) -> some View {
+        if #available(iOS 15.0, *) {
+            overlay(alignment: .bottom) {
+                if isActive {
+                    Rectangle()
+                        .frame(height: 1)
+                        .offset(y: 2)
+                }
+            }
+        } else {
+            underline(isActive)
+        }
+    }
+}
+
 struct SegmentedPicker_Previews: PreviewProvider {
     static var previews: some View {
         SegmentedPicker(
diff --git a/changelog.d/pr-7341.change b/changelog.d/pr-7341.change
new file mode 100644
index 000000000..2129cec32
--- /dev/null
+++ b/changelog.d/pr-7341.change
@@ -0,0 +1 @@
+Polls: update poll history UI.