1 files changed, 34 insertions, 0 deletions
diff --git a/internal/handlers/handlers.go b/internal/handlers/handlers.go
index 8abd4d7..fa97be0 100644
--- a/internal/handlers/handlers.go
+++ b/internal/handlers/handlers.go
@@ -373,6 +373,24 @@ func (h *Handler) fetchCalendarEvents(ctx context.Context, forceRefresh bool) ([
 	if h.googleCalendarClient == nil {
 		return nil, nil
 	}
+
+	// Get enabled calendars from store
+	configs, _ := h.store.GetSourceConfigsBySource("gcal")
+	var enabledIDs []string
+	for _, cfg := range configs {
+		if cfg.Enabled {
+			enabledIDs = append(enabledIDs, cfg.ItemID)
+		}
+	}
+
+	// If none enabled but we have a default from config, use that as a fallback
+	// (or if we want to respect the toggle strictly, we should only use enabled ones)
+	if len(enabledIDs) == 0 {
+		return nil, nil
+	}
+
+	h.googleCalendarClient.SetCalendarIDs(enabledIDs)
+
 	fetcher := &CacheFetcher[models.CalendarEvent]{
 		Store:        h.store,
 		CacheKey:     store.CacheKeyGoogleCalendar,
@@ -389,6 +407,22 @@ func (h *Handler) fetchGoogleTasks(ctx context.Context, forceRefresh bool) ([]mo
 	if h.googleTasksClient == nil {
 		return nil, nil
 	}
+
+	// Get enabled task lists from store
+	configs, _ := h.store.GetSourceConfigsBySource("gtasks")
+	var enabledIDs []string
+	for _, cfg := range configs {
+		if cfg.Enabled {
+			enabledIDs = append(enabledIDs, cfg.ItemID)
+		}
+	}
+
+	if len(enabledIDs) == 0 {
+		return nil, nil
+	}
+
+	h.googleTasksClient.SetTaskListID(strings.Join(enabledIDs, ","))
+
 	fetcher := &CacheFetcher[models.GoogleTask]{
 		Store:        h.store,
 		CacheKey:     store.CacheKeyGoogleTasks,