diff --git a/erpnext/translations/fr.csv b/erpnext/translations/fr.csv
index 90a7a6247c0ae3d18d32b3ae07657699a7a67be0..06b474be491cc8180d057849b38b3e5e3e17bc90 100644
--- a/erpnext/translations/fr.csv
+++ b/erpnext/translations/fr.csv
@@ -3731,6 +3731,7 @@ Display Additional Information,Informations additionnelles,
 Display Images,Images,
 Display Information,Informations,
 Display Items In Stock,Afficher les articles en stock,
+Display Past Event, Afficher les événements passés,
 Display Settings,Paramètres d'affichage,
 Disposal Date,Date de cession/destruction,
 Distance UOM,Distance UOM,
diff --git a/erpnext/venue/web_template/event_card/event_card.html b/erpnext/venue/web_template/event_card/event_card.html
index d9b776cb7ff0a642b2318a1f6e710edbb0470040..496d5e8884cd5e309ffcae90275862436b3a1aab 100644
--- a/erpnext/venue/web_template/event_card/event_card.html
+++ b/erpnext/venue/web_template/event_card/event_card.html
@@ -1,3 +1,32 @@
+{%- set sort_field = sort_field -%}
+{%- set filters = filters or [] -%}
+
+{# Prepare filters #}
+{%- set ns = namespace(query_filters=[], method=frappe.get_list) -%}
+{% set filt = ["Event", "published", "=", "1"] -%}
+{% set ns.query_filters = ns.query_filters + [filt] -%}
+{% set ns.method = frappe.get_all -%}
+{% set date = frappe.utils.get_datetime() %}
+
+{%- for filt in filters -%}
+	{%- if filt.fieldname and filt.value -%}
+	{%- set filt = ["Event", filt.fieldname, "=", filt.value] -%}
+		{%- set ns.query_filters = ns.query_filters + [filt] -%}
+	{%- endif -%}
+{%- endfor -%}
+
+{% if not display_past_event %}
+	{% set ns.query_filters = ns.query_filters + [["Event", "starts_on", ">=", frappe.utils.today()]] %}
+{% endif %}
+
+{%- set event_list = ns.method(
+	"Event",
+	filters=ns.query_filters,
+	order_by=sort_field,
+	limit=limit,
+	pluck="name",
+) -%}
+
 {%- macro event_card(event, is_full_width=False, align="Left") -%}
 	{# {%- set align_events_class = resolve_class({
 		'align-events-end': align == 'Right',
@@ -116,12 +145,6 @@
 	</div>
 
 	<div style="display: flex; flex-wrap: wrap; gap: 1em; display: grid; grid-template-columns: repeat(auto-fill, minmax(250px, 1fr)); grid-template-rows: 1fr; align-items: stretch; justify-items: stretch;">
-		{%- set event_list = frappe.get_all(
-			'Event',
-			{'published': 1, 'event_type': 'Public'},
-			order_by='starts_on asc',
-			limit=limit if limit else 24,
-		) -%}
 		{%- for event in event_list: -%}
 			{%- set event = frappe.get_doc('Event', event) -%}
 			{{ event_card(event, is_full_width=True, align='Center') }}
diff --git a/erpnext/venue/web_template/event_card/event_card.json b/erpnext/venue/web_template/event_card/event_card.json
index e7fbf27adda347bb0dc5cad26f398d8d151a0d93..4311db6d422bbada1b041abb88a8b3d53e22785d 100644
--- a/erpnext/venue/web_template/event_card/event_card.json
+++ b/erpnext/venue/web_template/event_card/event_card.json
@@ -1,9 +1,11 @@
 {
+ "__unsaved": 1,
  "creation": "2023-12-07 17:29:26.161880",
  "docstatus": 0,
  "doctype": "Web Template",
  "fields": [
   {
+   "dynamic_template": 0,
    "fieldname": "title",
    "fieldtype": "Data",
    "label": "Title",
@@ -11,13 +13,53 @@
   },
   {
    "default": "16",
+   "dynamic_template": 0,
    "fieldname": "limit",
    "fieldtype": "Int",
    "label": "Limit",
    "reqd": 0
+  },
+  {
+   "__unsaved": 1,
+   "default": "0",
+   "dynamic_template": 0,
+   "fieldname": "display_past_event",
+   "fieldtype": "Check",
+   "label": "Display Past Event",
+   "reqd": 0
+  },
+  {
+   "default": "starts_on asc",
+   "dynamic_template": 0,
+   "fieldname": "sort_field",
+   "fieldtype": "Data",
+   "label": "Sort Field",
+   "reqd": 1
+  },
+  {
+   "dynamic_template": 0,
+   "fieldname": "filters",
+   "fieldtype": "Table Break",
+   "label": "Filters",
+   "reqd": 0
+  },
+  {
+   "dynamic_template": 0,
+   "fieldname": "fieldname",
+   "fieldtype": "Data",
+   "label": "Fieldname",
+   "reqd": 0
+  },
+  {
+   "dynamic_template": 0,
+   "fieldname": "value",
+   "fieldtype": "Data",
+   "label": "Value",
+   "reqd": 0
   }
  ],
- "modified": "2023-12-07 17:29:26.161880",
+ "idx": 0,
+ "modified": "2024-03-06 12:43:33.640955",
  "modified_by": "Administrator",
  "module": "Venue",
  "name": "Event Card",
@@ -25,4 +67,4 @@
  "standard": 1,
  "template": "",
  "type": "Section"
-}
+}
\ No newline at end of file