diff --git a/gnome-calendar-check-for-null-child.patch b/gnome-calendar-check-for-null-child.patch
new file mode 100644
index 0000000..cd2cdec
--- /dev/null
+++ b/gnome-calendar-check-for-null-child.patch
@@ -0,0 +1,29 @@
+From b9d4405e69dc6c69112a5546aea1c8d709336bac Mon Sep 17 00:00:00 2001
+From: Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
+Date: Fri, 4 Aug 2023 21:41:08 -0300
+Subject: [PATCH] views/week-header: Check for NULL child
+
+I'm not sure if this is actually correct, but I'm too tired to
+think the week header through, so let's just be slightly more
+protective for now.
+---
+ src/gui/views/gcal-week-header.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/gui/views/gcal-week-header.c b/src/gui/views/gcal-week-header.c
+index a652618b..b1509cc7 100644
+--- a/src/gui/views/gcal-week-header.c
++++ b/src/gui/views/gcal-week-header.c
+@@ -764,6 +764,9 @@ apply_overflow_at_weekday (GcalWeekHeader *self,
+ 
+   child = gtk_grid_get_child_at (self->grid, weekday, 3);
+ 
++  if (!child)
++    return;
++
+   split_event_widget_at_column (self, child, weekday);
+   gtk_widget_set_visible (child, FALSE);
+ }
+-- 
+2.40.0
+
diff --git a/gnome-calendar.changes b/gnome-calendar.changes
index 7258e50..322e10c 100644
--- a/gnome-calendar.changes
+++ b/gnome-calendar.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Aug 18 06:35:37 UTC 2023 - Jonathan Kang <songchuan.kang@suse.com>
+
+- Add gnome-calendar-check-for-null-child.patch: views/week-header:
+  Check for NULL child(glgo#GNOME/gnome-calendar/commit/b9d4405e6,
+  bsc#1214188).
+
 -------------------------------------------------------------------
 Sat Apr 22 19:23:02 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
 
diff --git a/gnome-calendar.spec b/gnome-calendar.spec
index 04106bc..21b6779 100644
--- a/gnome-calendar.spec
+++ b/gnome-calendar.spec
@@ -24,6 +24,8 @@ License:        GPL-3.0-or-later
 Group:          Productivity/Office/Organizers
 URL:            https://wiki.gnome.org/Design/Apps/Calendar
 Source0:        https://download.gnome.org/sources/gnome-calendar/44/%{name}-%{version}.tar.xz
+# PATCH-FIX-UPSTREAM gnome-calendar-check-for-null-child.patch glgo#GNOME/gnome-calendar/commit/b9d4405e6 bsc#1214188 sckang@suse.com -- views/week-header: Check for NULL child
+Patch0:         gnome-calendar-check-for-null-child.patch
 
 BuildRequires:  fdupes
 BuildRequires:  meson