diff --git a/app/src/main/java/com/nextcloud/talk/polls/repositories/PollRepositoryImpl.kt b/app/src/main/java/com/nextcloud/talk/polls/repositories/PollRepositoryImpl.kt
index d5329869a..60939718c 100644
--- a/app/src/main/java/com/nextcloud/talk/polls/repositories/PollRepositoryImpl.kt
+++ b/app/src/main/java/com/nextcloud/talk/polls/repositories/PollRepositoryImpl.kt
@@ -123,7 +123,7 @@ class PollRepositoryImpl(private val ncApi: NcApi, private val currentUserProvid
                 pollResponse.id,
                 pollResponse.question,
                 pollResponse.options,
-                pollResponse.votes,
+                convertVotes(pollResponse.votes),
                 pollResponse.actorType,
                 pollResponse.actorId,
                 pollResponse.actorDisplayName,
@@ -137,6 +137,14 @@ class PollRepositoryImpl(private val ncApi: NcApi, private val currentUserProvid
             return poll
         }
 
+        private fun convertVotes(votes: Map<String, Int>?): Map<String, Int> {
+            val resultMap: MutableMap<String, Int> = HashMap()
+            votes?.forEach {
+                resultMap[it.key.replace("option-", "")] = it.value
+            }
+            return resultMap
+        }
+
         private fun mapToPollDetails(pollDetailsResponse: PollDetailsResponse): PollDetails {
             return PollDetails(
                 pollDetailsResponse.actorType,