diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index a9c94b81630..225e0e7407d 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -1010,6 +1010,11 @@ int reply_search(connection_struct *conn, char *inbuf,char *outbuf, int dum_size
 		}
 		string_set(&conn->dirpath,dptr_path(dptr_num));
 		pstrcpy(mask, dptr_wcard(dptr_num));
+		/*
+		 * For a 'continue' search we have no string. So
+		 * check from the initial saved string.
+		 */
+		mask_contains_wcard = ms_has_wild(mask);
 	}
 
 	p = smb_buf(outbuf) + 3;