diff --git a/lib/curl_fnmatch.c b/lib/curl_fnmatch.c
index f33bba1f1..5b6d28c06 100644
--- a/lib/curl_fnmatch.c
+++ b/lib/curl_fnmatch.c
@@ -352,6 +352,8 @@ static int loop(const unsigned char *pattern, const unsigned char *string,
         unsigned char *pp = p + 1; /* cannot handle with pointer to register */
         if(setcharset(&pp, charset)) {
           int found = FALSE;
+          if(!*s)
+            return CURL_FNMATCH_NOMATCH;
           if(charset[(unsigned int)*s])
             found = TRUE;
           else if(charset[CURLFNM_ALNUM])
@@ -380,9 +382,7 @@ static int loop(const unsigned char *pattern, const unsigned char *string,
 
           if(found) {
             p = pp + 1;
-            if(*s)
-              /* don't advance if we're matching on an empty string */
-              s++;
+            s++;
             memset(charset, 0, CURLFNM_CHSET_SIZE);
           }
           else
diff --git a/tests/unit/unit1307.c b/tests/unit/unit1307.c
index 266eed392..eff5edebc 100644
--- a/tests/unit/unit1307.c
+++ b/tests/unit/unit1307.c
@@ -97,8 +97,8 @@ static const struct testcase tests[] = {
   { "*[^a].t?t",                "a.txt",                  NOMATCH },
   { "*[^a].t?t",                "ba.txt",                 NOMATCH },
   { "*[^a].t?t",                "ab.txt",                 MATCH },
-  { "*[^a]",                    "",                       MATCH },
-  { "[!ÿ]",                     "",                       MATCH },
+  { "*[^a]",                    "",                       NOMATCH },
+  { "[!ÿ]",                     "",                       NOMATCH },
   { "[!?*[]",                   "?",                      NOMATCH },
   { "[!!]",                     "!",                      NOMATCH },
   { "[!!]",                     "x",                      MATCH },