diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/handlers/OsmHandler.java b/app/src/main/java/de/apps4ics/mountainnavigation/handlers/OsmHandler.java
index 168375e..95773ba 100644
--- a/app/src/main/java/de/apps4ics/mountainnavigation/handlers/OsmHandler.java
+++ b/app/src/main/java/de/apps4ics/mountainnavigation/handlers/OsmHandler.java
@@ -39,7 +39,7 @@
                 e.printStackTrace();
             }
         }
-        if(limit != -1) return poisAround.subList(0, limit);
+        if(limit != -1) return poisAround.subList(0, Math.min(limit, poisAround.size()));
         else return poisAround;
     }
 }