diff --git a/Nginx/Jobs/AcmeWriteCertificates.ts b/Nginx/Jobs/AcmeWriteCertificates.ts
index b9f53fc719..b9a9e7a510 100644
--- a/Nginx/Jobs/AcmeWriteCertificates.ts
+++ b/Nginx/Jobs/AcmeWriteCertificates.ts
@@ -1,4 +1,3 @@
-import LIMIT_MAX from "Common/Types/Database/LimitMax";
 import { EVERY_FIFTEEN_MINUTE, EVERY_MINUTE } from "Common/Utils/CronTime";
 import { IsDevelopment } from "Common/Server/EnvironmentConfig";
 import AcmeCertificateService from "Common/Server/Services/AcmeCertificateService";
@@ -19,14 +18,13 @@ export default class Jobs {
         // Fetch all domains where certs are added to greenlock.
 
         const certs: Array<AcmeCertificate> =
-          await AcmeCertificateService.findBy({
+          await AcmeCertificateService.findAllBy({
             query: {},
             select: {
               domain: true,
               certificate: true,
               certificateKey: true,
             },
-            limit: LIMIT_MAX,
             skip: 0,
             props: {
               isRoot: true,
diff --git a/Nginx/Jobs/WriteCustomCertsToDisk.ts b/Nginx/Jobs/WriteCustomCertsToDisk.ts
index 34a75e9a52..44e06a8bdf 100644
--- a/Nginx/Jobs/WriteCustomCertsToDisk.ts
+++ b/Nginx/Jobs/WriteCustomCertsToDisk.ts
@@ -1,4 +1,3 @@
-import LIMIT_MAX from "Common/Types/Database/LimitMax";
 import { EVERY_FIFTEEN_MINUTE, EVERY_MINUTE } from "Common/Utils/CronTime";
 import { IsDevelopment } from "Common/Server/EnvironmentConfig";
 import StatusPageDomainService from "Common/Server/Services/StatusPageDomainService";
@@ -20,7 +19,7 @@ export default class Jobs {
         // Fetch all domains where certs are added to greenlock.
 
         const statusPageDomains: Array<StatusPageDomain> =
-          await StatusPageDomainService.findBy({
+          await StatusPageDomainService.findAllBy({
             query: {
               isCustomCertificate: true,
               customCertificate: QueryHelper.notNull(),
@@ -31,7 +30,6 @@ export default class Jobs {
               customCertificate: true,
               customCertificateKey: true,
             },
-            limit: LIMIT_MAX,
             skip: 0,
             props: {
               isRoot: true,