diff --git a/.env b/.env
index 0a53e4b04..858bf3633 100644
--- a/.env
+++ b/.env
@@ -1,2 +1,2 @@
 REGISTRY_PREFIX=harbor.sheldan.dev/abstracto/
-VERSION=1.5.20
\ No newline at end of file
+VERSION=1.5.21
\ No newline at end of file
diff --git a/abstracto-application/abstracto-modules/webservices/webservices-impl/src/main/java/dev/sheldan/abstracto/webservices/wikipedia/service/WikipediaServiceBean.java b/abstracto-application/abstracto-modules/webservices/webservices-impl/src/main/java/dev/sheldan/abstracto/webservices/wikipedia/service/WikipediaServiceBean.java
index eccb8db0e..210a2c9e7 100644
--- a/abstracto-application/abstracto-modules/webservices/webservices-impl/src/main/java/dev/sheldan/abstracto/webservices/wikipedia/service/WikipediaServiceBean.java
+++ b/abstracto-application/abstracto-modules/webservices/webservices-impl/src/main/java/dev/sheldan/abstracto/webservices/wikipedia/service/WikipediaServiceBean.java
@@ -47,7 +47,9 @@ public class WikipediaServiceBean implements WikipediaService {
         WikipediaResponse wikipediaResponse = gson.fromJson(response.body().string(), WikipediaResponse.class);
         if(wikipediaResponse.getQuery() == null
                 || wikipediaResponse.getQuery().getPages() == null
-                || (wikipediaResponse.getQuery().getPages().stream().anyMatch(wikipediaResponsePageModel -> wikipediaResponsePageModel.getPageId().equals(-1L))
+                || (wikipediaResponse.getQuery().getPages().stream().anyMatch(wikipediaResponsePageModel ->
+                    wikipediaResponsePageModel.getPageId() == null
+                    || wikipediaResponsePageModel.getPageId().equals(-1L))
                 && wikipediaResponse.getQuery().getPages().size() == 1)
                 ) {
             throw new NoWikipediaArticleFoundException();