diff --git a/RiotSwiftUI/Modules/Room/PollHistory/PollHistoryViewModel.swift b/RiotSwiftUI/Modules/Room/PollHistory/PollHistoryViewModel.swift
index 1687cf2f4..c73e2ea32 100644
--- a/RiotSwiftUI/Modules/Room/PollHistory/PollHistoryViewModel.swift
+++ b/RiotSwiftUI/Modules/Room/PollHistory/PollHistoryViewModel.swift
@@ -58,7 +58,6 @@ private extension PollHistoryViewModel {
                 self?.handleBatchEnded(completion: completion)
             } receiveValue: { [weak self] polls in
                 self?.add(polls: polls)
-                self?.updateViewState()
             }
             .store(in: &subcriptions)
     }
@@ -71,8 +70,11 @@ private extension PollHistoryViewModel {
         case .finished:
             break
         case .failure:
+            polls = polls ?? []
             self.completion?(.genericError)
         }
+        
+        updateViewState()
     }
     
     func setupUpdateSubscriptions() {