diff --git a/packages/loot-core/src/server/budget/goals/goalsSchedule.ts b/packages/loot-core/src/server/budget/goals/goalsSchedule.ts
index 18d703d8470..1caf145a543 100644
--- a/packages/loot-core/src/server/budget/goals/goalsSchedule.ts
+++ b/packages/loot-core/src/server/budget/goals/goalsSchedule.ts
@@ -177,5 +177,5 @@ export async function goalsSchedule(
     increment = Math.round(increment);
     to_budget += increment;
   }
-  return { to_budget, errors, remainder };
+  return { to_budget, errors, remainder, scheduleFlag };
 }
diff --git a/packages/loot-core/src/server/budget/goaltemplates.ts b/packages/loot-core/src/server/budget/goaltemplates.ts
index a6ba49ea4ae..9e8e5b49982 100644
--- a/packages/loot-core/src/server/budget/goaltemplates.ts
+++ b/packages/loot-core/src/server/budget/goaltemplates.ts
@@ -603,6 +603,7 @@ async function applyCategoryTemplate(
         to_budget = goalsReturn.to_budget;
         errors = goalsReturn.errors;
         remainder = goalsReturn.remainder;
+        scheduleFlag = goalsReturn.scheduleFlag;
         break;
       }
       case 'remainder': {
diff --git a/upcoming-release-notes/1984.md b/upcoming-release-notes/1984.md
new file mode 100644
index 00000000000..32ab464e526
--- /dev/null
+++ b/upcoming-release-notes/1984.md
@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [shall0pass]
+---
+
+Goals: Fix Schedule overbudget condition