diff --git a/docs/releases/unreleased.md b/docs/releases/unreleased.md
index db8f3317..a2967c0e 100644
--- a/docs/releases/unreleased.md
+++ b/docs/releases/unreleased.md
@@ -67,6 +67,12 @@ Example:
 
 ## Fixed
 
+- (#1028, #1140, #1152, #1354, #1362) Fixed duplicate task entries appearing in Agenda view
+  - Tasks were shown twice: once as TaskNotes events and again as property-based events with a file icon
+  - Changed default Agenda template to disable property-based events (`showPropertyBasedEvents: false`)
+  - Users can re-enable property-based events in view settings if needed for non-task date properties
+  - Thanks to @YIRU69, @jhedlund, @dblinnikov, @Snakiest, @WeiYiAcc, @JacksonMcDonaldDev, @jimbo108108, and @krelltunez for reporting
+
 - (#1386) Fixed `timeEstimateCategory` formula showing "Long (>2h)" instead of "No estimate" for new tasks
   - The condition didn't properly handle null values when `timeEstimate` property is unset
   - Also fixed the same issue in `trackingStatus` formula
diff --git a/docs/views/default-base-templates.md b/docs/views/default-base-templates.md
index 8ceb50de..bfd0a8c4 100644
--- a/docs/views/default-base-templates.md
+++ b/docs/views/default-base-templates.md
@@ -481,6 +481,8 @@ views:
 
 Used by the **Agenda** command to display tasks in a list-based agenda view.
 
+Note: Property-based events are disabled by default to avoid duplicate entries when tasks already have due/scheduled dates.
+
 ```yaml
 # Agenda
 
@@ -506,6 +508,8 @@ views:
       - file.name
       - recurrence
       - complete_instances
+    options:
+      showPropertyBasedEvents: false
     calendarView: "listWeek"
     startDateProperty: file.ctime
     listDayCount: 7
diff --git a/src/templates/defaultBasesFiles.ts b/src/templates/defaultBasesFiles.ts
index a80271d5..94a936a3 100644
--- a/src/templates/defaultBasesFiles.ts
+++ b/src/templates/defaultBasesFiles.ts
@@ -659,6 +659,8 @@ views:
     name: "Agenda"
     order:
 ${orderYaml}
+    options:
+      showPropertyBasedEvents: false
     calendarView: "listWeek"
     startDateProperty: file.ctime
     listDayCount: 7