diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 97a1e0ec6..5502fd6c4 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -24,7 +24,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        java: [11, 17, 20, 21-ea]
+        java: [11, 17, 20]
         distribution: ['zulu']
       fail-fast: false
       max-parallel: 5
diff --git a/src/main/java/org/mybatis/dynamic/sql/util/spring/NamedParameterJdbcTemplateExtensions.java b/src/main/java/org/mybatis/dynamic/sql/util/spring/NamedParameterJdbcTemplateExtensions.java
index 43e972157..250825c35 100644
--- a/src/main/java/org/mybatis/dynamic/sql/util/spring/NamedParameterJdbcTemplateExtensions.java
+++ b/src/main/java/org/mybatis/dynamic/sql/util/spring/NamedParameterJdbcTemplateExtensions.java
@@ -54,7 +54,10 @@ public long count(Buildable<SelectModel> countStatement) {
     }
 
     public long count(SelectStatementProvider countStatement) {
-        return template.queryForObject(countStatement.getSelectStatement(), countStatement.getParameters(), Long.class);
+        Long answer = template.queryForObject(countStatement.getSelectStatement(),
+                countStatement.getParameters(), Long.class);
+
+        return answer == null ? 0L : answer;
     }
 
     public int delete(Buildable<DeleteModel> deleteStatement) {