diff --git a/src/main/java/com/github/pagehelper/PageInfo.java b/src/main/java/com/github/pagehelper/PageInfo.java
index a8ad2c76..69a50270 100644
--- a/src/main/java/com/github/pagehelper/PageInfo.java
+++ b/src/main/java/com/github/pagehelper/PageInfo.java
@@ -125,7 +125,7 @@ public PageInfo(List<T> list, int navigatePages) {
             this.pageNum = 1;
             this.pageSize = list.size();
 
-            this.pages = 1;
+            this.pages = this.pageSize > 0 ? 1 : 0;
             this.list = list;
             this.size = list.size();
             this.total = list.size();
@@ -200,7 +200,7 @@ private void calcPage() {
      */
     private void judgePageBoudary() {
         isFirstPage = pageNum == 1;
-        isLastPage = pageNum == pages;
+        isLastPage = pageNum == pages || pages == 0;;
         hasPreviousPage = pageNum > 1;
         hasNextPage = pageNum < pages;
     }