feast-dev
diff --git a/‎sdk/python/feast/feature_server.py‎
Lines changed: 13 additions & 12 deletions b/‎sdk/python/feast/feature_server.py‎
Lines changed: 13 additions & 12 deletions
@@ -346,24 +346,25 @@ async def _get_feast_object(
     ) -> FeastObject:
         # FIXME: this logic repeated at least 3 times in the codebase - should be centralized
         # in logging, in server and in feature_store (Python SDK)
-        potential_sources = [
-            store.get_feature_view,
-            store.get_on_demand_feature_view,
-            store.get_stream_feature_view,
-        ]
-
-        for source in potential_sources:
+        try:
+            return await run_in_threadpool(
+                store.get_stream_feature_view,
+                feature_view_name,
+                allow_registry_cache=allow_registry_cache,
+            )
+        except FeatureViewNotFoundException:
             try:
                 return await run_in_threadpool(
-                    source,
+                    store.get_feature_view,
                     feature_view_name,
                     allow_registry_cache=allow_registry_cache,
                 )
             except FeatureViewNotFoundException:
-                continue
-
-        # By this point, none of the sources found the feature view
-        raise FeatureViewNotFoundException(feature_view_name)
+                return await run_in_threadpool(
+                    store.get_on_demand_feature_view,
+                    feature_view_name,
+                    allow_registry_cache=allow_registry_cache,
+                )
 
     @app.post("/write-to-online-store", dependencies=[Depends(inject_user_details)])
     async def write_to_online_store(request: WriteToFeatureStoreRequest) -> None: