diff --git a/plymouth-crash-avoid-on-keyboard-remove-input-handler.patch b/plymouth-crash-avoid-on-keyboard-remove-input-handler.patch
new file mode 100644
index 0000000..1ba78a0
--- /dev/null
+++ b/plymouth-crash-avoid-on-keyboard-remove-input-handler.patch
@@ -0,0 +1,20 @@
+diff -Nura plymouth-0.9.5~git20220412.e960111/src/libply-splash-core/ply-keyboard.c plymouth-0.9.5~git20220412.e960111_new/src/libply-splash-core/ply-keyboard.c
+--- plymouth-0.9.5~git20220412.e960111/src/libply-splash-core/ply-keyboard.c	2022-04-15 16:39:24.000000000 +0800
++++ plymouth-0.9.5~git20220412.e960111_new/src/libply-splash-core/ply-keyboard.c	2022-05-15 23:31:14.329149370 +0800
+@@ -522,6 +522,8 @@
+ 
+         assert (keyboard != NULL);
+ 
++        if (ply_list_get_length(keyboard->keyboard_input_handler_list))
++        {
+         for (node = ply_list_get_first_node (keyboard->keyboard_input_handler_list);
+              node; node = ply_list_get_next_node (keyboard->keyboard_input_handler_list, node)) {
+                 ply_keyboard_closure_t *closure = ply_list_node_get_data (node);
+@@ -531,6 +533,7 @@
+                         return;
+                 }
+         }
++        }
+ }
+ 
+ void
diff --git a/plymouth.changes b/plymouth.changes
index 3636d38..5fb6770 100644
--- a/plymouth.changes
+++ b/plymouth.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sun May 15 15:58:33 UTC 2022 - Cliff Zhao <qzhao@suse.com>
+
+- Add plymouth-crash-avoid-on-keyboard-remove-input-handler.patch
+  Confirm keyboard handler list not NULL before release memory
+  to avoid crash(bsc#1193736).
+
 -------------------------------------------------------------------
 Sun May 15 14:38:55 UTC 2022 - Hans-Peter Jansen <hpj@urpla.net>
 
diff --git a/plymouth.spec b/plymouth.spec
index 80bedcb..9c8909a 100644
--- a/plymouth.spec
+++ b/plymouth.spec
@@ -40,6 +40,8 @@ Patch2:         plymouth-manpages.patch
 Patch3:         plymouth-disable-fedora-logo.patch
 # PATCH-FIX-OPENSUSE plymouth-only_use_fb_for_cirrus_bochs.patch bnc#888590 boo#1172028 bsc#1181913 fvogt@suse.com -- force fb for cirrus and bochs, force drm otherwise. replace removal of framebuffer driver and plymouth-ignore-cirrusdrm.patch with single patch.
 Patch4:         plymouth-only_use_fb_for_cirrus_bochs.patch
+# PATCH-FIX-OPENSUSE plymouth-crash-avoid-on-keyboard-remove-input-handler.patch bsc#1193736 qzhao@suse.com -- Confirm keyboard handler list not NULL before release memory to avoid crash.
+Patch5:         plymouth-crash-avoid-on-keyboard-remove-input-handler.patch
 # PATCH-FIX-OPENSUSE plymouth-install-label-library-and-font-file-to-initrd.patch boo#1183425 boo#1184309 qzhao@suse.com -- Pack label plugin and font into initram to ensure notice info could successfully show when partition encrypted.
 Patch6:         plymouth-install-label-library-and-font-file-to-initrd.patch
 # PATCH-FIX-OPENSUSE plymouth-screen-twice-scale-on-160DPI-higher.patch boo#1183425 boo#1184309 qzhao@suse.com -- When DPI > 160, screen will scale output twice.