diff --git a/CHANGELOG.md b/CHANGELOG.md
index ee5bc7a..9d0882e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+**1.5.4.14**
+
+- Fixing infinite scroll trying to load more items when there are no more.
+
 **1.5.4.13**
 
 - Displaying the right number of items.
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 3413528..b0d18fc 100644
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/HomeActivity.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/HomeActivity.kt
@@ -208,7 +208,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                                 else -> 0
                             }
 
-                            if (lastVisibleItem === items.size && items.size <= maxItemNumber()) {
+                            if (lastVisibleItem === items.size && items.size <= maxItemNumber() && maxItemNumber() >= itemsNumber) {
                                 getElementsAccordingToTab(appendResults = true, offsetOverride = lastVisibleItem)
                             }
 
diff --git a/build.gradle b/build.gradle
index c1af772..0b2ddcf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,7 +10,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0'
+        classpath 'com.android.tools.build:gradle:3.0.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong