diff --git a/src/module.c b/src/module.c
index a505a2099..70a63fee7 100644
--- a/src/module.c
+++ b/src/module.c
@@ -5872,6 +5872,9 @@ void moduleFireServerEvent(uint64_t eid, int subid, void *data) {
                 moduledata = &civ1;
             } else if (eid == REDISMODULE_EVENT_FLUSHDB) {
                 moduledata = data;
+                RedisModuleFlushInfoV1 *fi = data;
+                if (fi->dbnum != -1)
+                    selectDb(ctx.client, fi->dbnum);
             }
             el->callback(&ctx,el->event,subid,moduledata);
             moduleFreeContext(&ctx);