diff --git a/src/server/zset_family.cc b/src/server/zset_family.cc
index 62a495cfb..c07198b8f 100644
--- a/src/server/zset_family.cc
+++ b/src/server/zset_family.cc
@@ -1335,6 +1335,7 @@ void BZPopMinMax(CmdArgList args, ConnectionContext* cntx, bool is_max) {
   switch (popped_key.status()) {
     case OpStatus::WRONG_TYPE:
       return rb->SendError(kWrongTypeErr);
+    case OpStatus::CANCELLED:
     case OpStatus::TIMED_OUT:
       return rb->SendNullArray();
     default: