diff --git a/src/lib/db/event-store.ts b/src/lib/db/event-store.ts
index 9cb1c2739c..f413e1f4ca 100644
--- a/src/lib/db/event-store.ts
+++ b/src/lib/db/event-store.ts
@@ -162,7 +162,7 @@ class EventStore implements IEventStore {
             )
             .andWhere('id', '>=', largerThan)
             .first();
-        return row ? row.max : -1;
+        return row?.max ?? 0;
     }
 
     async delete(key: number): Promise<void> {
diff --git a/src/lib/features/feature-toggle/configuration-revision-service.ts b/src/lib/features/feature-toggle/configuration-revision-service.ts
index b3b229f2cc..3c145bc60a 100644
--- a/src/lib/features/feature-toggle/configuration-revision-service.ts
+++ b/src/lib/features/feature-toggle/configuration-revision-service.ts
@@ -18,10 +18,11 @@ export default class ConfigurationRevisionService extends EventEmitter {
         super();
         this.logger = getLogger('configuration-revision-service.ts');
         this.eventStore = eventStore;
+        this.revisionId = 0;
     }
 
     async getMaxRevisionId(): Promise<number> {
-        if (this.revisionId) {
+        if (this.revisionId > 0) {
             return this.revisionId;
         } else {
             return this.updateMaxRevisionId();