diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/web/ClientAPI.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/web/ClientAPI.java
index 2cce0e228..25fb8fcf2 100644
--- a/openid-connect-server/src/main/java/org/mitre/openid/connect/web/ClientAPI.java
+++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/web/ClientAPI.java
@@ -513,6 +513,10 @@ public class ClientAPI {
 			} else {
 				// get the image from cache
 				CachedImage image = clientLogoLoadingService.getLogo(client);
+				
+				if (image == null){
+				  return new ResponseEntity<>(HttpStatus.NOT_FOUND);
+				}
 
 				HttpHeaders headers = new HttpHeaders();
 				headers.setContentType(MediaType.parseMediaType(image.getContentType()));