diff --git a/CHANGELOG.md b/CHANGELOG.md
index 526f955..dd53a4c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+**1.5.4.17**
+
+- Fixed the last bug with infinite scroll.
+
 **1.5.4.16**
 
 - Fixing list view displaying issues.
diff --git a/app/src/main/java/apps/amine/bou/readerforselfoss/HomeActivity.kt b/app/src/main/java/apps/amine/bou/readerforselfoss/HomeActivity.kt
index 30896e0..88f06fb 100644
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/HomeActivity.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/HomeActivity.kt
@@ -607,13 +607,15 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                         else -> Unit
                     }
 
-            override fun onTabSelected(position: Int) =
-                    when (position) {
-                        0 -> getUnRead()
-                        1 -> getRead()
-                        2 -> getStarred()
-                        else -> Unit
-                    }
+            override fun onTabSelected(position: Int) {
+                offset = 0
+                when (position) {
+                    0 -> getUnRead()
+                    1 -> getRead()
+                    2 -> getStarred()
+                    else -> Unit
+                }
+            }
 
         })
     }