diff --git a/voltha/adapters/brcm_openomci_onu/brcm_openomci_onu_handler.py b/voltha/adapters/brcm_openomci_onu/brcm_openomci_onu_handler.py
index b4817e9..5860cc7 100644
--- a/voltha/adapters/brcm_openomci_onu/brcm_openomci_onu_handler.py
+++ b/voltha/adapters/brcm_openomci_onu/brcm_openomci_onu_handler.py
@@ -406,6 +406,11 @@
                         self.log.error('unsupported-action-type',
                                   action_type=action.type, in_port=_in_port)
 
+                #FIXME: CAREFUL, ignoring flow matching on ethertype
+
+                if _type is not None:
+                    continue
+
                 #
                 # All flows created from ONU adapter should be OMCI based
                 #