diff --git a/src/db.c b/src/db.c
index c7de0049..1ed0bb2a 100644
--- a/src/db.c
+++ b/src/db.c
@@ -462,6 +462,7 @@ void scanGenericCommand(redisClient *c, robj *o) {
 
         while(intsetGet(o->ptr,pos++,&ll))
             listAddNodeTail(keys,createStringObjectFromLongLong(ll));
+        cursor = 0;
     } else if (o->type == REDIS_HASH || o->type == REDIS_ZSET) {
         unsigned char *p = ziplistIndex(o->ptr,0);
         unsigned char *vstr;
@@ -475,6 +476,7 @@ void scanGenericCommand(redisClient *c, robj *o) {
                                  createStringObjectFromLongLong(vll));
             p = ziplistNext(o->ptr,p);
         }
+        cursor = 0;
     } else {
         redisPanic("Not handled encoding in SCAN.");
     }