diff --git a/src/JWT.php b/src/JWT.php
index 977d7fbd..30b4cbb7 100644
--- a/src/JWT.php
+++ b/src/JWT.php
@@ -425,14 +425,15 @@ private static function getKey(
             return $keyOrKeyArray;
         }
 
+        if (empty($kid)) {
+            throw new UnexpectedValueException('"kid" empty, unable to lookup correct key');
+        }
+
         if ($keyOrKeyArray instanceof CachedKeySet) {
             // Skip "isset" check, as this will automatically refresh if not set
             return $keyOrKeyArray[$kid];
         }
 
-        if (empty($kid)) {
-            throw new UnexpectedValueException('"kid" empty, unable to lookup correct key');
-        }
         if (!isset($keyOrKeyArray[$kid])) {
             throw new UnexpectedValueException('"kid" invalid, unable to lookup correct key');
         }