diff --git a/0284-term-ns8250-return-null-in-case-of-a-null-address.patch b/0284-term-ns8250-return-null-in-case-of-a-null-address.patch
new file mode 100644
index 0000000..6ed829e
--- /dev/null
+++ b/0284-term-ns8250-return-null-in-case-of-a-null-address.patch
@@ -0,0 +1,29 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Leo Sandoval <lsandova@redhat.com>
+Date: Wed, 8 Jan 2025 10:24:26 -0600
+Subject: [PATCH] term/ns8250: return in case of a null SPCR base addresses
+
+Serial SPCR MMIO null address are invalid, so return from function, otherwise
+invalid 'mmio,0' port names are generated halting the system when running
+terminal_input|output commands.
+
+Resolves: #RHEL-68622
+Signed-off-by: Leo Sandoval <lsandova@redhat.com>
+---
+ grub-core/term/ns8250.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/grub-core/term/ns8250.c b/grub-core/term/ns8250.c
+index 23e8e0904..4ac0bc06a 100644
+--- a/grub-core/term/ns8250.c
++++ b/grub-core/term/ns8250.c
+@@ -407,6 +407,9 @@ grub_serial_ns8250_add_mmio (grub_addr_t addr, unsigned int acc_size,
+   struct grub_serial_port *p;
+   unsigned i;
+ 
++  if (addr == NULL)
++    return NULL;
++
+   for (i = 0; i < GRUB_SERIAL_PORT_NUM; i++)
+     if (com_ports[i].use_mmio == true && com_ports[i].mmio.base == addr)
+       {
diff --git a/grub.patches b/grub.patches
index 0f67361..6ea53e6 100644
--- a/grub.patches
+++ b/grub.patches
@@ -281,3 +281,4 @@ Patch0280: 0280-grub2-mkconfig-Pass-all-boot-params-when-used-by-ana.patch
 Patch0281: 0281-10_linux.in-escape-semicolon-and-ampersand-on-BLS-up.patch
 Patch0282: 0282-acpi-Fix-out-of-bounds-access-in-grub_acpi_xsdt_find.patch
 Patch0283: 0283-fs-xfs-Fix-large-extent-counters-incompat-feature-su.patch
+Patch0284: 0284-term-ns8250-return-null-in-case-of-a-null-address.patch
diff --git a/grub2.spec b/grub2.spec
index 29a39cb..dea9b96 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -17,7 +17,7 @@
 Name:		grub2
 Epoch:		1
 Version:	2.12
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Bootloader with support for Linux, Multiboot and more
 License:	GPL-3.0-or-later
 URL:		http://www.gnu.org/software/grub/
@@ -583,6 +583,10 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg
 %endif
 
 %changelog
+* Mon Jan 13 2025 Leo Sandoval <lsandova@redhat.com> 2.12-6
+- term/ns8250: return in case of a null SPCR base addresses
+- Resolves: #RHEL-68622
+
 * Thu Jan 09 2025 Nicolas Frayer <nfrayer@redhat.com> 2.12-5
 - fs/xfs: fix large extent counters incompat feature support
 - Resolves: #RHEL-68390