diff --git a/rma_sale/views/sale_portal_template.xml b/rma_sale/views/sale_portal_template.xml
index 3063a429..3bd5b1c8 100644
--- a/rma_sale/views/sale_portal_template.xml
+++ b/rma_sale/views/sale_portal_template.xml
@@ -87,7 +87,9 @@
                                 </thead>
                                 <tbody class="request-rma-tbody">
                                     <t t-foreach="data_list" t-as="data">
-                                        <t t-if="data['quantity'] > 0">
+                                        <t
+                                            t-if="data['quantity'] > 0 and data['picking']"
+                                        >
                                             <tr>
                                                 <td class="text-left">
                                                     <span
@@ -124,7 +126,6 @@
                                                 </td>
                                                 <td class="text-left">
                                                     <span
-                                                        t-if="data['picking']"
                                                         t-esc="data['picking'].name"
                                                     />
                                                     <input
diff --git a/website_rma/controllers/main.py b/website_rma/controllers/main.py
index 2ba75fdc..437188ca 100644
--- a/website_rma/controllers/main.py
+++ b/website_rma/controllers/main.py
@@ -23,10 +23,19 @@ class WebsiteRMA(http.Controller):
         """Domain used for the products to be shown in selection of
         the web form.
         """
-        return [
+        domain = [
             ("name", "=ilike", "%{}%".format(q or "")),
             ("sale_ok", "=", True),
         ]
+        # HACK: As there is no glue module for this purpose we have put
+        # this this condition to check that the mrp module is installed.
+        if "bom_ids" in request.env["product.product"]._fields:
+            domain += [
+                "|",
+                ("bom_ids.type", "!=", "phantom"),
+                ("bom_ids", "=", False),
+            ]
+        return domain
 
     @http.route(["/requestrma"], type="http", auth="user", website=True)
     def request_rma(self, **kw):