diff --git a/src/ORM/client-statistics/client-statistics.service.ts b/src/ORM/client-statistics/client-statistics.service.ts
index 2ce541e..fa94cef 100644
--- a/src/ORM/client-statistics/client-statistics.service.ts
+++ b/src/ORM/client-statistics/client-statistics.service.ts
@@ -63,7 +63,7 @@ export class ClientStatisticsService {
                 WHERE
                 entry.address = ? AND entry.time > datetime("now", "-1 day")
                 GROUP BY
-                    strftime('%Y-%m-%d %H', time, 'localtime') || (strftime('%M', time, 'localtime') / 5)
+                    strftime('%Y-%m-%d %H', time, 'localtime') || (strftime('%M', time, 'localtime') / 10)
                 ORDER BY
                 time
             )
@@ -111,7 +111,7 @@ export class ClientStatisticsService {
                 WHERE
                 entry.address = ? AND entry.clientName = ? AND entry.time > datetime("now", "-1 day")
                 GROUP BY
-                    strftime('%Y-%m-%d %H', time, 'localtime') || (strftime('%M', time, 'localtime') / 5)
+                    strftime('%Y-%m-%d %H', time, 'localtime') || (strftime('%M', time, 'localtime') / 10)
                 ORDER BY
                 time
             )
@@ -160,7 +160,7 @@ export class ClientStatisticsService {
                 WHERE
                 entry.address = ? AND entry.clientName = ? AND entry.sessionId = ? AND entry.time > datetime("now", "-1 day")
                 GROUP BY
-                    strftime('%Y-%m-%d %H', time, 'localtime') || (strftime('%M', time, 'localtime') / 5)
+                    strftime('%Y-%m-%d %H', time, 'localtime') || (strftime('%M', time, 'localtime') / 10)
                 ORDER BY
                     time
             )
diff --git a/src/models/StratumV1ClientStatistics.ts b/src/models/StratumV1ClientStatistics.ts
index a62adfd..b61ddea 100644
--- a/src/models/StratumV1ClientStatistics.ts
+++ b/src/models/StratumV1ClientStatistics.ts
@@ -2,7 +2,7 @@ import { ClientStatisticsService } from '../ORM/client-statistics/client-statist
 import { ClientEntity } from '../ORM/client/client.entity';
 
 const CACHE_SIZE = 30;
-const TARGET_SUBMISSION_PER_SECOND = 30;
+const TARGET_SUBMISSION_PER_SECOND = 10;
 export class StratumV1ClientStatistics {
 
     private submissionCacheStart: Date;
@@ -70,7 +70,11 @@ export class StratumV1ClientStatistics {
         x = x | (x >> 8);
         x = x | (x >> 16);
         x = x | (x >> 32);
-        return x - (x >> 1);
+        const val = x - (x >> 1);
+        if (val < 1) {
+            return 1;
+        }
+        return val;
     }