diff --git a/etemplate/js/et2_extension_nextmatch.js b/etemplate/js/et2_extension_nextmatch.js
index 66b3d2db8e..f30eed6461 100644
--- a/etemplate/js/et2_extension_nextmatch.js
+++ b/etemplate/js/et2_extension_nextmatch.js
@@ -2394,10 +2394,9 @@ var et2_nextmatch_header_bar = et2_DOMWidget.extend(et2_INextmatchHeader,
 		}
 
 		// Legacy: Add in 'All' option for cat_id, if not provided.
-		if(name == 'cat_id' && options != null && typeof options[''] == 'undefined' && typeof options[0] == 'undefined')
+		if(name == 'cat_id' && options != null && (typeof options[''] == 'undefined' || options[0].value != ''))
 		{
 			widget_options.empty_label = this.egw().lang('All');
-			this.egw().debug('warn', 'Nextmatch category filter had no "All" option.  Added, but you should fix that.');
 		}
 
 		// Create widget