diff --git a/vending-app/src/main/java/org/microg/vending/billing/core/ui/UIParser.kt b/vending-app/src/main/java/org/microg/vending/billing/core/ui/UIParser.kt
index 7521ae3dcb..9d5c2f4dad 100644
--- a/vending-app/src/main/java/org/microg/vending/billing/core/ui/UIParser.kt
+++ b/vending-app/src/main/java/org/microg/vending/billing/core/ui/UIParser.kt
@@ -98,7 +98,10 @@ private fun parseAction(action: Action?, result: BAction): Boolean {
     }
     action.viewClickAction?.let { viewClickAction ->
         if (viewClickAction.uiInfo != null) {
-            result.uiInfo = parseUIInfo(viewClickAction.uiInfo!!)
+            val parsedUiInfo = parseUIInfo(viewClickAction.uiInfo!!)
+            if (parsedUiInfo.uiType != UIType.UNKNOWN) {
+                result.uiInfo = parsedUiInfo
+            }
         }
         return parseAction(viewClickAction.action, result)
     }
@@ -488,7 +491,8 @@ private fun parseViewInfo(viewInfo: ViewInfo): BViewInfo {
 private fun parseContentComponent(contentComponent: ContentComponent): BComponent {
     val tag = contentComponent.tag
     val viewInfo = contentComponent.viewInfo?.let { parseViewInfo(it) }
-    val uiInfo = contentComponent.uiInfo?.let { parseUIInfo(it) }
+    val uiInfo = contentComponent.uiInfo?.let {
+        parseUIInfo(it) }
     val cc = contentComponent
     return when {
         cc.iconTextCombinationView != null -> BComponent(tag, uiInfo, viewInfo, ViewType.ICONTEXTCOMBINATIONVIEW, iconTextCombinationView = parseIconTextCombinationView(cc.iconTextCombinationView!!))
@@ -528,7 +532,8 @@ private fun parseButtonGroupView(buttonGroupView: ButtonGroupView): BButtonGroup
 private fun parseFooterComponent(footerComponent: FooterComponent): BComponent {
     val tag = footerComponent.tag
     val viewInfo = footerComponent.viewInfo?.let { parseViewInfo(it) }
-    val uiInfo = footerComponent.uiInfo?.let { parseUIInfo(it) }
+    val uiInfo = footerComponent.uiInfo?.let {
+        parseUIInfo(it) }
     val fc = footerComponent
     return when {
         fc.buttonGroupView != null -> BComponent(tag, uiInfo, viewInfo, ViewType.BUTTONGROUPVIEW, buttonGroupView = parseButtonGroupView(fc.buttonGroupView!!))