diff --git a/app/src/main/java/com/isolaatti/posting/comments/presentation/CommentsRecyclerViewAdapter.kt b/app/src/main/java/com/isolaatti/posting/comments/presentation/CommentsRecyclerViewAdapter.kt
index 1022548..805b313 100644
--- a/app/src/main/java/com/isolaatti/posting/comments/presentation/CommentsRecyclerViewAdapter.kt
+++ b/app/src/main/java/com/isolaatti/posting/comments/presentation/CommentsRecyclerViewAdapter.kt
@@ -71,18 +71,15 @@ class CommentsRecyclerViewAdapter(private var list: List<Comment>, private val m
             return
         }
 
-        val commentUpdated = updateEvent.affectedPosition?.let { list[it] }
-        val position = updateEvent.affectedPosition
 
+        val position = updateEvent.affectedPosition
         previousSize = itemCount
         list = updatedList
 
-
-
         when(updateEvent.updateType) {
 
             UpdateEvent.UpdateType.COMMENT_REMOVED -> {
-                if(commentUpdated != null && position != null)
+                if(position != null)
                     notifyItemRemoved(position)
             }
             UpdateEvent.UpdateType.COMMENT_ADDED_TOP -> {
diff --git a/app/src/main/java/com/isolaatti/posting/posts/presentation/PostsRecyclerViewAdapter.kt b/app/src/main/java/com/isolaatti/posting/posts/presentation/PostsRecyclerViewAdapter.kt
index 16e28e9..4a1e6ae 100644
--- a/app/src/main/java/com/isolaatti/posting/posts/presentation/PostsRecyclerViewAdapter.kt
+++ b/app/src/main/java/com/isolaatti/posting/posts/presentation/PostsRecyclerViewAdapter.kt
@@ -137,7 +137,13 @@ class PostsRecyclerViewAdapter (private val markwon: Markwon, private val callba
             notifyDataSetChanged()
             return
         }
-        val postUpdated = updateEvent.affectedPosition?.let { postList?.get(it) }
+        val postUpdated = updateEvent.affectedPosition?.let {
+            if(updateEvent.updateType == UpdateEvent.UpdateType.POST_REMOVED) {
+                null
+            } else {
+                postList?.get(it)
+            }
+        }
         val position = updateEvent.affectedPosition
 
         previousSize = itemCount
@@ -153,7 +159,7 @@ class PostsRecyclerViewAdapter (private val markwon: Markwon, private val callba
                     notifyItemChanged(position, CommentsCountUpdatePayload(postUpdated.numberOfComments))
             }
             UpdateEvent.UpdateType.POST_REMOVED -> {
-                if(postUpdated != null && position != null)
+                if(position != null)
                     notifyItemRemoved(position)
             }
             UpdateEvent.UpdateType.POST_ADDED -> {