diff --git a/apps/workflowengine/js/admin.js b/apps/workflowengine/js/admin.js
index ab122a8cd650b..3a453befb8b6f 100644
--- a/apps/workflowengine/js/admin.js
+++ b/apps/workflowengine/js/admin.js
@@ -248,6 +248,7 @@
 					var check = OCA.WorkflowEngine.getCheckByClass(value);
 					if (!_.isUndefined(check)) {
 						checks[id]['operator'] = check['operators'][0]['operator'];
+						checks[id]['value'] = '';
 					}
 				}
 				// model change will trigger render
diff --git a/apps/workflowengine/js/filesystemtagsplugin.js b/apps/workflowengine/js/filesystemtagsplugin.js
index dc6f608d85a3e..e66a35b73b948 100644
--- a/apps/workflowengine/js/filesystemtagsplugin.js
+++ b/apps/workflowengine/js/filesystemtagsplugin.js
@@ -63,7 +63,9 @@
 				},
 				formatSelection: function (tagId) {
 					var tag = OC.SystemTags.collection.get(tagId);
-					return OC.SystemTags.getDescriptiveTag(tag);
+					if (!_.isUndefined(tag)) {
+						return OC.SystemTags.getDescriptiveTag(tag);
+					}
 				},
 				escapeMarkup: function(m) {
 					return m;