diff --git a/rc-service/rc-service-console/console-application/src/main/java/com/red/circle/console/app/service/app/user/UserWalletServiceImpl.java b/rc-service/rc-service-console/console-application/src/main/java/com/red/circle/console/app/service/app/user/UserWalletServiceImpl.java
index b3e90a39..47fcad50 100644
--- a/rc-service/rc-service-console/console-application/src/main/java/com/red/circle/console/app/service/app/user/UserWalletServiceImpl.java
+++ b/rc-service/rc-service-console/console-application/src/main/java/com/red/circle/console/app/service/app/user/UserWalletServiceImpl.java
@@ -180,19 +180,23 @@ public class UserWalletServiceImpl implements UserWalletService {
 
   private UserGoldRunningWaterClsTmpCO getGoldRunningWaterDbFallback(
       UserGoldRunningWaterBackQryCmd query) {
-    if (StringUtils.isNotBlank(query.getContext())) {
+    if (StringUtils.isNotBlank(query.getContext()) && Objects.isNull(query.getLastId())) {
       return new UserGoldRunningWaterClsTmpCO()
           .setListOver(true)
           .setWaters(Lists.newArrayList());
     }
 
     List<UserGoldRunningWaterCO> waters = listGoldRunningWater(query);
+    int limit = Optional.ofNullable(query.getLimit()).filter(value -> value > 0)
+        .orElse(PageConstant.DEFAULT_LIMIT_SIZE);
     if (CollectionUtils.isEmpty(waters)) {
-      return null;
+      return new UserGoldRunningWaterClsTmpCO()
+          .setListOver(true)
+          .setWaters(Lists.newArrayList());
     }
 
     return new UserGoldRunningWaterClsTmpCO()
-        .setListOver(true)
+        .setListOver(waters.size() < limit)
         .setWaters(waters);
   }