diff --git a/src/db.c b/src/db.c
index dd02526579e11e7facfaebd599ebe91056f4beb3..66b0e6a9f73b28c8819e7f76632948006c01bbf9 100644
--- a/src/db.c
+++ b/src/db.c
@@ -495,11 +495,16 @@ void scanGenericCommand(redisClient *c, robj *o) {
         if (filter) {
             decrRefCount(kobj);
             listDelNode(keys, node);
-            /* Also remove the value for hashes and sorted sets. */
-            if (o && (o->type == REDIS_ZSET || o->type == REDIS_HASH)) {
-                node = nextnode;
+        }
+
+        /* If this is an hash or a sorted set, we have a flat list of
+         * key-value elements, so if this element was filtered, remove the
+         * value, or skip it if it was not filtered: we only match keys. */
+        if (o && (o->type == REDIS_ZSET || o->type == REDIS_HASH)) {
+            node = nextnode;
+            nextnode = listNextNode(node);
+            if (filter) {
                 kobj = listNodeValue(node);
-                nextnode = listNextNode(node);
                 decrRefCount(kobj);
                 listDelNode(keys, node);
             }