diff --git a/web/package/agama-web-ui.changes b/web/package/agama-web-ui.changes
index 038be6d507..6b23968f83 100644
--- a/web/package/agama-web-ui.changes
+++ b/web/package/agama-web-ui.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Mar 24 10:17:30 UTC 2025 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>
+
+- Properly handle empty lists of unsupported AutoYaST elements
+  (gh#agama-project/agama#2196).
+
 -------------------------------------------------------------------
 Sun Mar 23 02:13:56 UTC 2025 - David Diaz <dgonzalez@suse.com>
 
diff --git a/web/src/components/questions/UnsupportedAutoYaST.test.tsx b/web/src/components/questions/UnsupportedAutoYaST.test.tsx
index 1f9845b9ee..a2c40c58d3 100644
--- a/web/src/components/questions/UnsupportedAutoYaST.test.tsx
+++ b/web/src/components/questions/UnsupportedAutoYaST.test.tsx
@@ -63,7 +63,7 @@ describe("UnsupportedAutoYaST", () => {
 
   describe("when there are no unsupported (but planned) elements", () => {
     beforeEach(() => {
-      mockQuestion = { ...question, data: {} };
+      mockQuestion = { ...question, data: { planned: "" } };
     });
 
     it('does not render the "Not implemented yet" list', () => {
@@ -75,7 +75,7 @@ describe("UnsupportedAutoYaST", () => {
 
   describe("when there are no unsupported (but planned) elements", () => {
     beforeEach(() => {
-      mockQuestion = { ...question, data: {} };
+      mockQuestion = { ...question, data: { unsupported: "" } };
     });
 
     it('does not render the "Not supported" list', () => {
diff --git a/web/src/components/questions/UnsupportedAutoYaST.tsx b/web/src/components/questions/UnsupportedAutoYaST.tsx
index 6136b27d64..5a8b7dade2 100644
--- a/web/src/components/questions/UnsupportedAutoYaST.tsx
+++ b/web/src/components/questions/UnsupportedAutoYaST.tsx
@@ -74,8 +74,8 @@ export default function UnsupportedAutoYaST({
     answerCallback(question);
   };
 
-  const planned = question.data.planned?.split(",") || [];
-  const unsupported = question.data.unsupported?.split(",") || [];
+  const planned = question.data.planned ? question.data.planned.split(",") : [];
+  const unsupported = question.data.unsupported ? question.data.unsupported.split(",") : [];
 
   return (
     <Popup isOpen title={_("Unsupported AutoYaST elements")}>