diff --git a/src/networking.c b/src/networking.c
index 8dd6ac986..b6306db18 100644
--- a/src/networking.c
+++ b/src/networking.c
@@ -4610,7 +4610,7 @@ NULL
 
         char *opt = c->argv[2]->ptr;
         if (!strcasecmp(opt,"yes")) {
-            if (c->flags & CLIENT_TRACKING_OPTIN) {
+            if (c->flags & CLIENT_TRACKING_OPTIN || c->flags & CLIENT_TRACKING_BCAST) {
                 c->flags |= CLIENT_TRACKING_CACHING;
             } else {
                 addReplyError(c,"CLIENT CACHING YES is only valid when tracking is enabled in OPTIN mode.");