diff --git a/pungi/wrappers/comps.py b/pungi/wrappers/comps.py
index 589330b2..b4cf7570 100644
--- a/pungi/wrappers/comps.py
+++ b/pungi/wrappers/comps.py
@@ -183,15 +183,16 @@ class CompsFilter(object):
         """
         all_groups = self.tree.xpath("/comps/group/id/text()") + lookaside_groups
         for environment in self.tree.xpath("/comps/environment"):
-            for group in environment.xpath("grouplist/groupid"):
-                if group.text not in all_groups:
-                    group.getparent().remove(group)
+            for parent_tag in ("grouplist", "optionlist"):
+                for group in environment.xpath("%s/groupid" % parent_tag):
+                    if group.text not in all_groups:
+                        group.getparent().remove(group)
 
-            for group in environment.xpath("grouplist/groupid[@arch]"):
-                value = group.attrib.get("arch")
-                values = [v for v in re.split(r"[, ]+", value) if v]
-                if arch not in values:
-                    group.getparent().remove(group)
+                for group in environment.xpath("%s/groupid[@arch]" % parent_tag):
+                    value = group.attrib.get("arch")
+                    values = [v for v in re.split(r"[, ]+", value) if v]
+                    if arch not in values:
+                        group.getparent().remove(group)
 
     def remove_empty_environments(self):
         """
diff --git a/tests/data/dummy-comps.xml b/tests/data/dummy-comps.xml
index 3e73366b..9a3b148d 100644
--- a/tests/data/dummy-comps.xml
+++ b/tests/data/dummy-comps.xml
@@ -108,6 +108,7 @@
       <groupid>core</groupid>
     </grouplist>
     <optionlist>
+      <groupid arch="x86_64">standard</groupid>
     </optionlist>
   </environment>