@@ -221,6 +221,12 @@ func (h *Handler) filterDashboardRecommendations(ctx context.Context, session *S
 // therefore correct: it projects "how much would I save if I only bought
 // RIs to cover X% of my instances" against the 100%-coverage baseline
 // that every provider gives us. Verified by TestSummarizeRecommendationsWithCoverage_100PctContract.
+//
+// Note: CurrentSavings is NOT set here. It represents committed/realized
+// savings from active purchase history, populated separately in
+// getDashboardSummary via aggregateActiveCommitmentsPerService. A service
+// with recommendations but no active purchases correctly ships
+// current_savings: 0. (Issue #1031)
 func summarizeRecommendationsWithCoverage( //nolint:gocritic // unnamedResult: return names would conflict with body locals
 	recs []config.RecommendationRecord,
 	coverageByKey map[string]float64,
@@ -245,17 +251,6 @@ func summarizeRecommendationsWithCoverage( //nolint:gocritic // unnamedResult: r
 		total += scaled
 		svc := byService[rep.rec.Service]
 		svc.PotentialSavings += scaled
-		// CurrentSavings is the committed/realized monthly savings for the
-		// service: the full 100%-coverage potential (rec.Savings) projected
-		// down to the operator-configured coverage %. scaledSavings already
-		// computes exactly that (rec.Savings * min(coverage,100)/100), so we
-		// reuse it rather than re-deriving the coverage lookup. When no
-		// coverage override exists the rec falls through to full savings, so
-		// CurrentSavings == PotentialSavings (nothing committed-away yet); a
-		// configured coverage < 100 pulls CurrentSavings below the potential.
-		// Issue #908: this field was previously never set, so the Home
-		// chart's current-savings underlay always rendered as $0.
-		svc.CurrentSavings += scaled
 		byService[rep.rec.Service] = svc
 	}
 	return total, byService
 
@@ -265,9 +265,10 @@ func TestSummarizeRecommendationsWithCoverage(t *testing.T) {
 			total, byService := summarizeRecommendationsWithCoverage(tc.recs, tc.coverage)
 			assert.InDelta(t, tc.wantTotal, total, 0.0001)
 			assert.InDelta(t, tc.wantTotal, byService["rds"].PotentialSavings, 0.0001)
-			// Issue #908: CurrentSavings (committed/realized) is sourced from
-			// the same coverage-scaled amount, so it tracks the scaled total.
-			assert.InDelta(t, tc.wantTotal, byService["rds"].CurrentSavings, 0.0001)
+			// CurrentSavings is populated by getDashboardSummary from purchase
+			// history, not here — it must remain 0 from this function (issue #1031).
+			assert.Equal(t, 0.0, byService["rds"].CurrentSavings,
+				"summarize must not set CurrentSavings")
 		})
 	}
 }
@@ -322,15 +323,14 @@ func TestSummarizeRecommendationsWithCoverage_100PctContract(t *testing.T) {
 		"nil coverage map must return un-scaled savings (issue #201 contract)")
 }
 
-// TestSummarizeRecommendationsWithCoverage_PopulatesCurrentSavings is the
-// issue #908 regression: by_service[svc].current_savings must be populated
-// (and keyed/scaled identically to potential) so the Home chart's
-// current-savings underlay renders instead of being a flat $0 series.
-//
-// Before the fix, summarizeRecommendationsWithCoverage set only
-// PotentialSavings, leaving CurrentSavings at its float64 zero value for
-// every service regardless of configured coverage.
-func TestSummarizeRecommendationsWithCoverage_PopulatesCurrentSavings(t *testing.T) {
+// TestSummarizeRecommendationsWithCoverage_DoesNotSetCurrentSavings asserts
+// that summarizeRecommendationsWithCoverage only populates PotentialSavings.
+// CurrentSavings represents committed/realized savings from active purchase
+// history and is populated separately in getDashboardSummary via
+// aggregateActiveCommitmentsPerService. Mixing the two here would cause a
+// service with recommendations but no purchases to falsely report non-zero
+// CurrentSavings (issue #1031).
+func TestSummarizeRecommendationsWithCoverage_DoesNotSetCurrentSavings(t *testing.T) {
 	acctA := "acct-A"
 	keyEC2 := config.AccountConfigKey(acctA, "aws", "ec2")
 	keyRDS := config.AccountConfigKey(acctA, "aws", "rds")
@@ -345,21 +345,18 @@ func TestSummarizeRecommendationsWithCoverage_PopulatesCurrentSavings(t *testing
 
 	_, byService := summarizeRecommendationsWithCoverage(recs, coverage)
 
-	// current_savings is non-zero where coverage exists and is scaled the
-	// same way potential is (rec.Savings * coverage/100), keyed per service.
-	assert.InDelta(t, 600.0, byService["ec2"].CurrentSavings, 0.001,
-		"ec2 current_savings = 1000 * 60/100")
-	assert.InDelta(t, 100.0, byService["rds"].CurrentSavings, 0.001,
-		"rds current_savings = 400 * 25/100")
-
-	// And it matches PotentialSavings (both flow from the same scaled amount).
-	assert.InDelta(t, byService["ec2"].PotentialSavings, byService["ec2"].CurrentSavings, 0.001)
-	assert.InDelta(t, byService["rds"].PotentialSavings, byService["rds"].CurrentSavings, 0.001)
-
-	// Sanity: every populated service has a strictly positive current_savings
-	// when coverage is configured (the bug produced 0 here).
-	require.Positive(t, byService["ec2"].CurrentSavings)
-	require.Positive(t, byService["rds"].CurrentSavings)
+	// PotentialSavings is scaled correctly by coverage.
+	assert.InDelta(t, 600.0, byService["ec2"].PotentialSavings, 0.001,
+		"ec2 potential_savings = 1000 * 60/100")
+	assert.InDelta(t, 100.0, byService["rds"].PotentialSavings, 0.001,
+		"rds potential_savings = 400 * 25/100")
+
+	// CurrentSavings is NOT set here — it remains the float64 zero value.
+	// getDashboardSummary populates it from purchase history (issue #1031).
+	assert.Equal(t, 0.0, byService["ec2"].CurrentSavings,
+		"summarize must not set CurrentSavings; that is getDashboardSummary's responsibility")
+	assert.Equal(t, 0.0, byService["rds"].CurrentSavings,
+		"summarize must not set CurrentSavings; that is getDashboardSummary's responsibility")
 }
 
 // TestSummarizeRecommendationsWithCoverage_DedupesVariantsPerCell is the
@@ -408,8 +405,8 @@ func TestSummarizeRecommendationsWithCoverage_DedupesVariantsPerCell(t *testing.
 	// sum of all variants (100+200+300+50 = 650).
 	assert.InDelta(t, 350.0, byService["ec2"].PotentialSavings, 0.0001,
 		"by_service potential must sum per-cell MAX (300+50), not all variants")
-	assert.InDelta(t, 350.0, byService["ec2"].CurrentSavings, 0.0001,
-		"by_service current must dedupe identically to potential")
+	assert.Equal(t, 0.0, byService["ec2"].CurrentSavings,
+		"summarize must not set CurrentSavings; getDashboardSummary populates it from purchase history")
 	// The headline total dedupes the same way.
 	assert.InDelta(t, 350.0, total, 0.0001,
 		"total must sum per-cell MAX (300+50), not all variants")
@@ -1269,6 +1266,54 @@ func TestHandler_getDashboardSummary_CurrentSavingsJSON(t *testing.T) {
 		"current_savings field must carry the active purchase's EstimatedSavings")
 }
 
+// TestHandler_getDashboardSummary_CurrentSavingsZeroWhenNoCommitments is the
+// issue #1031 regression: a service with recommendations but no active purchase
+// history must ship current_savings: 0, not current_savings: potential_savings.
+//
+// The bug was that summarizeRecommendationsWithCoverage set CurrentSavings to
+// the same scaled value as PotentialSavings. getDashboardSummary only overwrites
+// CurrentSavings for services that appear in the purchase-history result, so
+// services with no purchases retained the wrong non-zero value.
+func TestHandler_getDashboardSummary_CurrentSavingsZeroWhenNoCommitments(t *testing.T) {
+	ctx := context.Background()
+
+	// No purchases at all — represents a new account that has recommendations
+	// but has not yet acted on them.
+	mockScheduler := new(MockScheduler)
+	mockStore := new(MockConfigStore)
+
+	mockScheduler.On("ListRecommendations", ctx, mock.Anything).Return(
+		[]config.RecommendationRecord{
+			{Service: "EC2", Savings: 500.0},
+			{Service: "RDS", Savings: 300.0},
+		}, nil)
+	mockStore.On("GetGlobalConfig", ctx).Return(&config.GlobalConfig{DefaultCoverage: 80.0}, nil)
+	mockStore.On("GetAllPurchaseHistory", ctx, mock.Anything).Return(
+		[]config.PurchaseHistoryRecord{}, nil)
+
+	mockAuth, req := adminDashboardReq(ctx)
+	handler := &Handler{
+		auth:      mockAuth,
+		scheduler: mockScheduler,
+		config:    mockStore,
+	}
+
+	result, err := handler.getDashboardSummary(ctx, req, map[string]string{})
+	require.NoError(t, err)
+
+	// PotentialSavings must be populated from recommendations.
+	assert.InDelta(t, 500.0, result.ByService["EC2"].PotentialSavings, 0.001)
+	assert.InDelta(t, 300.0, result.ByService["RDS"].PotentialSavings, 0.001)
+
+	// CurrentSavings must be 0 — no active commitments exist yet.
+	// Before the fix, this incorrectly equalled PotentialSavings because
+	// summarizeRecommendationsWithCoverage also wrote CurrentSavings (issue #1031).
+	assert.Equal(t, 0.0, result.ByService["EC2"].CurrentSavings,
+		"no active commitments: current_savings must be 0, not equal to potential_savings")
+	assert.Equal(t, 0.0, result.ByService["RDS"].CurrentSavings,
+		"no active commitments: current_savings must be 0, not equal to potential_savings")
+}
+
 func TestHandler_calculateCurrentCoverage(t *testing.T) {
 	handler := &Handler{}