diff --git a/src/api/api_epg.c b/src/api/api_epg.c
index 1fc74b82..a446e47d 100644
--- a/src/api/api_epg.c
+++ b/src/api/api_epg.c
@@ -29,7 +29,7 @@ static htsmsg_t *
 api_epg_get_list ( const char *s )
 {
   htsmsg_t *m = NULL;
-  char *r, *saveptr;
+  char *r, *saveptr = NULL;
   if (s && s[0] != '\0') {
     s = r = strdup(s);
     r = strtok_r(r, ";", &saveptr);
diff --git a/src/api/api_idnode.c b/src/api/api_idnode.c
index abfed290..a6994c2a 100644
--- a/src/api/api_idnode.c
+++ b/src/api/api_idnode.c
@@ -28,7 +28,7 @@ api_idnode_flist_conf( htsmsg_t *args, const char *name )
 {
   htsmsg_t *m = NULL;
   const char *s = htsmsg_get_str(args, name);
-  char *r, *saveptr;
+  char *r, *saveptr = NULL;
   if (s && s[0] != '\0') {
     s = r = strdup(s);
     r = strtok_r(r, ",;:", &saveptr);