diff --git a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v2/controller/EntityController.java b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v2/controller/EntityController.java
index 6c0da39d40..d844acb6f6 100644
--- a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v2/controller/EntityController.java
+++ b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v2/controller/EntityController.java
@@ -768,11 +768,11 @@ public class EntityController {
    * @return
    */
   private static AspectSpec lookupAspectSpec(EntitySpec entitySpec, String aspectName) {
-    return Optional.ofNullable(entitySpec.getAspectSpec(aspectName))
-        .orElse(
-            entitySpec.getAspectSpecs().stream()
-                .filter(aspec -> aspec.getName().toLowerCase().equals(aspectName))
-                .findFirst()
-                .get());
+    return entitySpec.getAspectSpec(aspectName) != null
+        ? entitySpec.getAspectSpec(aspectName)
+        : entitySpec.getAspectSpecs().stream()
+            .filter(aspec -> aspec.getName().toLowerCase().equals(aspectName))
+            .findFirst()
+            .get();
   }
 }