diff --git a/docs/implementation/task-ep1.6.1-calendar-empty-state-rendering-improvement-2026-07-13.md b/docs/implementation/task-ep1.6.1-calendar-empty-state-rendering-improvement-2026-07-13.md
new file mode 100644
index 0000000..5c1a46d
--- /dev/null
+++ b/docs/implementation/task-ep1.6.1-calendar-empty-state-rendering-improvement-2026-07-13.md
@@ -0,0 +1,39 @@
+# Task EP.1.6.1 Calendar Empty State Rendering Improvement - 2026-07-13
+
+## Scope Delivered
+
+- updated Calendar Day, Week, and Month views to always render calendar grid cells even when there are zero events
+- kept Agenda view list-oriented empty state behavior unchanged
+- added inline empty overlay for Day/Week/Month instead of replacing the calendar surface
+- added `+ Add Activity` entry point from empty calendar overlay using existing Activity workspace route
+- kept date/time rendering through `src/lib/date-format.ts`
+- preserved Calendar projection, Activity ownership, and Calendar adapter architecture
+
+## Review Summary
+
+Reviewed before implementation:
+
+- `AGENTS.md`
+- `plans/task-ep.1.6.1.md`
+- `docs/implementation/task-ep1.6-calendar-projection-workspace-big-calendar-foundation-2026-07-13.md`
+- `docs/implementation/task-ep1.7-my-day-workspace-foundation-2026-07-13.md`
+- `src/features/crm/calendar/components/calendar-workspace.tsx`
+- Calendar API contracts under `src/features/crm/calendar/api/types.ts`
+
+## Implementation Notes
+
+- Day view now renders 12 working-hour slots.
+- Week view now renders seven day cells.
+- Month view now renders a 42-cell month grid.
+- Empty Day/Week/Month views show a lightweight non-blocking overlay with Add Activity action.
+- Calendar cells remain rendered and selectable via button semantics.
+- Agenda retains `CalendarEmptyState` because a list view should show a list empty state.
+
+## Verification
+
+- `npm run typecheck`
+- `npx oxlint src/features/crm/calendar/components/calendar-workspace.tsx`
+
+## Outcome
+
+Empty graphical Calendar views now feel like available scheduling capacity rather than a missing screen.
diff --git a/plans/task-ep.1.6.1.md b/plans/task-ep.1.6.1.md
new file mode 100644
index 0000000..c0fdcac
--- /dev/null
+++ b/plans/task-ep.1.6.1.md
@@ -0,0 +1,248 @@
+## Calendar Empty State Rendering Improvement
+
+**Status:** Completed
+
+### Background
+
+The current Calendar Workspace renders a full-page empty state when no Calendar events are returned.
+
+Current behavior:
+
+```text
+No scheduled work in this period
+
+Try changing filters or create an Activity from the owning CRM record.
+```
+
+This behavior is acceptable for an Agenda (list) view but is not appropriate for graphical calendar views.
+
+A calendar should remain a calendar even when there are no events.
+
+Users still need to:
+
+* understand the selected date range
+* navigate between dates
+* visualize available time slots
+* click an empty day or time slot
+* create a new Activity
+* understand that the schedule is empty rather than the Calendar failing
+
+---
+
+## Required UX Change
+
+### Day View
+
+Always render the complete Calendar grid.
+
+When there are no events:
+
+* render the timeline/grid normally
+* show an inline empty-state hint inside the calendar body
+* keep toolbar, navigation, and date controls visible
+* allow selecting a time slot
+* allow creating a new Activity
+
+Do **NOT** replace the Calendar with a full-page empty screen.
+
+---
+
+### Week View
+
+Always render the Week grid.
+
+When there are no events:
+
+* render all days
+* render working hours
+* render current time indicator where applicable
+* render an inline empty hint only
+* preserve drag target areas for future Activity creation
+
+Do **NOT** hide the calendar grid.
+
+---
+
+### Month View
+
+Always render the Month calendar.
+
+When there are no events:
+
+* render the entire month
+* render all weeks
+* render date cells
+* render navigation
+* optionally display a small "No events" message inside the month body
+
+The Month view should always look like a usable calendar.
+
+---
+
+### Agenda View
+
+Agenda is different.
+
+Agenda is a list-based presentation.
+
+When there are no scheduled items:
+
+Show the existing empty state:
+
+```text
+No scheduled work in this period.
+
+Try changing filters or create an Activity.
+```
+
+This behavior remains correct.
+
+---
+
+## Rendering Rules
+
+Preferred rendering logic:
+
+```text
+Day
+ ↓
+Always render Calendar Grid
+
+Week
+ ↓
+Always render Calendar Grid
+
+Month
+ ↓
+Always render Calendar Grid
+
+Agenda
+ ↓
+If empty
+ Show Empty State
+Else
+ Show Agenda List
+```
+
+The Calendar component should never disappear simply because there are zero events.
+
+---
+
+## Empty Calendar Overlay
+
+Instead of replacing the Calendar component, render a lightweight overlay or inline message.
+
+Example:
+
+```text
+──────────────────────────────
+
+ No scheduled work
+
+ Your schedule is free.
+
+ [+ Add Activity]
+
+──────────────────────────────
+```
+
+The overlay must not block:
+
+* changing dates
+* changing view
+* selecting days
+* selecting time slots
+* opening filters
+
+---
+
+## Add Activity Entry Point
+
+When the Calendar contains no events, provide a visible primary action:
+
+```text
++ Add Activity
+```
+
+The button must reuse the existing Activity form and Activity API.
+
+Do not introduce a Calendar-specific create flow.
+
+---
+
+## Calendar Interaction
+
+Even when empty, users must still be able to:
+
+* navigate month/week/day
+* click a date
+* click a time slot
+* switch views
+* change filters
+* search
+* create Activities
+
+The Calendar should remain fully interactive.
+
+---
+
+## Big Calendar Integration
+
+Because the project uses **lramos33/big-calendar** as the UI foundation:
+
+* always render the Big Calendar component for Day, Week, and Month
+* pass an empty event array when appropriate
+* never short-circuit rendering based on `events.length === 0`
+* use the Calendar's native layout even when there are no events
+
+Avoid patterns such as:
+
+```tsx
+if (events.length === 0) {
+ return
- {formatDate(event.start)} -
-No scheduled work. This {view} is free.
++ The calendar grid is still available for selecting dates and planning Activities. +
+ +