diff --git a/src/config.c b/src/config.c
index b3507019..3ed19eb8 100644
--- a/src/config.c
+++ b/src/config.c
@@ -695,7 +695,7 @@ config_modify_tag( htsmsg_t *c, uint32_t id, const char *uuid, const void *aux )
 
   htsmsg_delete_field(c, "index");
 
-  if (ch == NULL)
+  if (ch == NULL || uuid == NULL)
     return;
 
   HTSMSG_FOREACH(f, ch) {