diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index 0a74d89197b609ae623075c351e514bcbc043b6f..81a2faec6807f3c8740c6c046d9959a0c23e0f26 100644
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -2525,6 +2525,13 @@ static int __unpoison_memory(unsigned long pfn, bool hw_mf_check)
 		goto unlock_mutex;
 	}
 
+	if (is_huge_zero_page(&folio->page)) {
+		unpoison_pr_info("Unpoison: huge zero page is not supported %#lx\n",
+				 pfn, &unpoison_rs);
+		ret = -EOPNOTSUPP;
+		goto unlock_mutex;
+	}
+
 	if (!PageHWPoison(p)) {
 		unpoison_pr_info("Unpoison: Page was already unpoisoned %#lx\n",
 				 pfn, &unpoison_rs);