diff --git a/control/templates/defs.mako b/control/templates/defs.mako
index 2fd3856..bcc0c5b 100644
--- a/control/templates/defs.mako
+++ b/control/templates/defs.mako
@@ -65,6 +65,8 @@
 std::vector<Signal>{
 %for s in event['signals']:
     Signal{
+        %if ('match' in s) and \
+            (s['match'] is not None):
         match::${s['match']}(
         %for i, mp in enumerate(s['mparams']):
         %if (i+1) != len(s['mparams']):
@@ -74,6 +76,9 @@
         %endif
         %endfor
         ),
+        %else:
+        "",
+        %endif
         make_handler(\
         ${indent(genHandler(sig=s), 3)}\
         )
diff --git a/control/templates/fan_zone_defs.mako.cpp b/control/templates/fan_zone_defs.mako.cpp
index fdf5bb2..a73449f 100644
--- a/control/templates/fan_zone_defs.mako.cpp
+++ b/control/templates/fan_zone_defs.mako.cpp
@@ -127,6 +127,8 @@
                         std::vector<Signal>{
                         %for s in event['pc']['pcsigs']:
                             Signal{
+                                %if ('match' in s) and \
+                                    (s['match'] is not None):
                                 match::${s['match']}(
                                 %for i, mp in enumerate(s['mparams']):
                                 %if (i+1) != len(s['mparams']):
@@ -136,6 +138,9 @@
                                 %endif
                                 %endfor
                                 ),
+                                %else:
+                                "",
+                                %endif
                                 make_handler(\
                                 ${indent(genHandler(sig=s), 9)}\
                                 )