diff --git a/auth/jwt.go b/auth/jwt.go
index 55824e254b55e6e2eb4d97d8db95b18e158877b5..65f79115c406fc89b212114856fc95130cc82b60 100644
--- a/auth/jwt.go
+++ b/auth/jwt.go
@@ -100,7 +100,7 @@ func ValidateJWT(jsonWebTokenString string, secretKey string) (JsonWebToken, err
 	}
 
 	// Validate the expiry date
-	if jsonWebToken.ExpiryDate.Before(date_utils.CurrentDate()) {
+	if !jsonWebToken.ExpiryDate.IsZero() && jsonWebToken.ExpiryDate.Before(date_utils.CurrentDate()) {
 		return jsonWebToken, errors.Error("token has expired")
 	}