diff --git a/src/google/adk/cli/adk_web_server.py b/src/google/adk/cli/adk_web_server.py
index 82279cb142..80104d017a 100644
--- a/src/google/adk/cli/adk_web_server.py
+++ b/src/google/adk/cli/adk_web_server.py
@@ -1068,10 +1068,13 @@ async def event_generator():
               sse_event = event.model_dump_json(
                   exclude_none=True, by_alias=True
               )
+              SSE_DONE_MESSAGE = 'data: {"done": true}\n\n'
               logger.debug(
                   "Generated event in agent run streaming: %s", sse_event
               )
               yield f"data: {sse_event}\n\n"
+            # Add done flag when all data has been sent
+            yield SSE_DONE_MESSAGE
         except Exception as e:
           logger.exception("Error in event_generator: %s", e)
           # You might want to yield an error event here
diff --git a/src/google/adk/cli/fast_api.py b/src/google/adk/cli/fast_api.py
index 7d93b54360..7bef5317ac 100644
--- a/src/google/adk/cli/fast_api.py
+++ b/src/google/adk/cli/fast_api.py
@@ -38,6 +38,7 @@
 from ..auth.credential_service.in_memory_credential_service import InMemoryCredentialService
 from ..evaluation.local_eval_set_results_manager import LocalEvalSetResultsManager
 from ..evaluation.local_eval_sets_manager import LocalEvalSetsManager
+from ..memory.base_memory_service import BaseMemoryService
 from ..memory.in_memory_memory_service import InMemoryMemoryService
 from ..memory.vertex_ai_memory_bank_service import VertexAiMemoryBankService
 from ..runners import Runner
@@ -60,6 +61,7 @@ def get_fast_api_app(
     session_db_kwargs: Optional[Mapping[str, Any]] = None,
     artifact_service_uri: Optional[str] = None,
     memory_service_uri: Optional[str] = None,
+    memory_service: Optional[BaseMemoryService] = None,
     eval_storage_uri: Optional[str] = None,
     allow_origins: Optional[list[str]] = None,
     web: bool,
@@ -107,7 +109,9 @@ def _parse_agent_engine_resource_name(agent_engine_id_or_resource_name):
     return project, location, agent_engine_id
 
   # Build the Memory service
-  if memory_service_uri:
+  if memory_service:
+    pass
+  elif memory_service_uri:
     if memory_service_uri.startswith("rag://"):
       from ..memory.vertex_ai_rag_memory_service import VertexAiRagMemoryService