diff --git a/management/server/jwtclaims/jwtValidator.go b/management/server/jwtclaims/jwtValidator.go
index 3e4b5e40e..b206eb794 100644
--- a/management/server/jwtclaims/jwtValidator.go
+++ b/management/server/jwtclaims/jwtValidator.go
@@ -101,11 +101,14 @@ func NewJWTValidator(issuer string, audienceList []string, keysLocation string,
 				if !keys.stillValid() {
 					lock.Lock()
 					defer lock.Unlock()
-					keys, err = getPemKeys(keysLocation)
+
+					refreshedKeys, err := getPemKeys(keysLocation)
 					if err != nil {
-						log.Debugf("cannot get JSONWebKey: %v", err)
-						return nil, err
+						log.Debugf("cannot get JSONWebKey: %v, falling back to old keys", err)
+						refreshedKeys = keys
 					}
+
+					keys = refreshedKeys
 				}
 			}