diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c
index 4f3f1b5ff..09ce949d3 100644
--- a/src/journal/sd-journal.c
+++ b/src/journal/sd-journal.c
@@ -118,6 +118,11 @@ _public_ int sd_journal_add_match(sd_journal *j, const void *data, size_t size)
         if (size <= 0)
                 return -EINVAL;
 
+        /* FIXME: iterating with multiple matches is currently
+         * broken */
+        if (j->matches)
+                return -ENOTSUP;
+
         le_hash = htole64(hash64(data, size));
 
         LIST_FOREACH(matches, m, j->matches) {