diff --git a/__tests__/unit/core-forger/delegate-tracker.test.ts b/__tests__/unit/core-forger/delegate-tracker.test.ts
index f829ac853f..47ab6d3ab5 100644
--- a/__tests__/unit/core-forger/delegate-tracker.test.ts
+++ b/__tests__/unit/core-forger/delegate-tracker.test.ts
@@ -12,6 +12,7 @@ import { mockLastBlock, setup } from "./setup";
 
 let delegateTracker: DelegateTracker;
 let loggerDebug: jest.SpyInstance;
+let loggerWarning: jest.SpyInstance;
 let activeDelegates;
 
 beforeEach(async () => {
@@ -19,6 +20,7 @@ beforeEach(async () => {
     const initialEnv = await setup(activeDelegates);
     delegateTracker = initialEnv.sandbox.app.resolve<DelegateTracker>(DelegateTracker);
     loggerDebug = initialEnv.spies.logger.debug;
+    loggerWarning = initialEnv.spies.logger.warning;
 });
 
 beforeEach(() => {
@@ -119,7 +121,7 @@ describe("DelegateTracker", () => {
             }
         });
 
-        it("should handle cases where there are less active delegates than the required delegate count", async () => {
+        it("should log warning when there are less active delegates than the required delegate count", async () => {
             const mockMileStoneData = {
                 blocktime: 2,
                 activeDelegates: 80,
@@ -130,20 +132,9 @@ describe("DelegateTracker", () => {
             delegateTracker.initialize(activeDelegates);
             await delegateTracker.handle();
 
-            /**
-             * TODO: check this is desired behaviour
-             * When there are less activeDelegates than required this behaves differently.
-             * In this case, the first entry in nextDelegates is calculated as forging next (as opposed to the second delegate in the test above).
-             * We also don't calculate (or log) the time until forging for any delegate.
-             */
-            for (let i = 0; i < activeDelegates.length; i++) {
-                const nextToForge = activeDelegates[i];
-                if (i === 0) {
-                    expect(loggerDebug).toHaveBeenCalledWith(`${nextToForge.publicKey} will forge next.`);
-                } else {
-                    expect(loggerDebug).toHaveBeenNthCalledWith(i + 2, `${nextToForge.publicKey} has already forged.`);
-                }
-            }
+            expect(loggerWarning).toHaveBeenCalledWith(
+                `Tracker only has ${activeDelegates.length} active delegates from a required ${mockMileStoneData.activeDelegates}`,
+            );
         });
     });
 });
diff --git a/__tests__/unit/core-forger/setup.ts b/__tests__/unit/core-forger/setup.ts
index cb2c9773df..ceee8b417b 100644
--- a/__tests__/unit/core-forger/setup.ts
+++ b/__tests__/unit/core-forger/setup.ts
@@ -15,10 +15,12 @@ export const setup = async activeDelegates => {
 
     const error: jest.SpyInstance = jest.fn();
     const debug: jest.SpyInstance = jest.fn();
+    const warning: jest.SpyInstance = jest.fn();
 
     const logger = {
         error,
         debug,
+        warning,
     };
 
     sandbox.app.bind(Container.Identifiers.LogService).toConstantValue(logger);
diff --git a/packages/core-forger/src/delegate-tracker.ts b/packages/core-forger/src/delegate-tracker.ts
index 865774fc32..6e416b83a9 100644
--- a/packages/core-forger/src/delegate-tracker.ts
+++ b/packages/core-forger/src/delegate-tracker.ts
@@ -87,6 +87,16 @@ export class DelegateTracker {
             }
         }
 
+        if (activeDelegates.length < delegatesCount) {
+            return this.logger.warning(
+                `Tracker only has ${Utils.pluralize(
+                    "active delegate",
+                    activeDelegates.length,
+                    true,
+                )} from a required ${delegatesCount}`,
+            );
+        }
+
         // Determine Next Forger Usernames...
         this.logger.debug(
             `Next Forgers: ${JSON.stringify(