diff --git a/Riot/Modules/ContextMenu/Services/RoomContextActionService.swift b/Riot/Modules/ContextMenu/Services/RoomContextActionService.swift
index b19698da6..12c02c938 100644
--- a/Riot/Modules/ContextMenu/Services/RoomContextActionService.swift
+++ b/Riot/Modules/ContextMenu/Services/RoomContextActionService.swift
@@ -111,7 +111,7 @@ class RoomContextActionService: NSObject, RoomContextActionServiceProtocol {
         self.delegate?.roomContextActionServiceDidMarkRoom(self)
     }
     func markAsUnread() {
-        room.markAsUnread()
+        room.setUnread()
         self.delegate?.roomContextActionServiceDidMarkRoom(self)
     }
     
diff --git a/Riot/Modules/Room/MXKRoomViewController.m b/Riot/Modules/Room/MXKRoomViewController.m
index 06fa9d618..b1b43112c 100644
--- a/Riot/Modules/Room/MXKRoomViewController.m
+++ b/Riot/Modules/Room/MXKRoomViewController.m
@@ -373,7 +373,7 @@
     
     if (!self.isContextPreview)
     {
-        [self.roomDataSource.room unmarkAsUnread];
+        [self.roomDataSource.room resetUnread];
     }
 }