diff --git a/enterprise/storage/saas_settings_store.py b/enterprise/storage/saas_settings_store.py
index 6cbcb50802..cfcbec7583 100644
--- a/enterprise/storage/saas_settings_store.py
+++ b/enterprise/storage/saas_settings_store.py
@@ -94,6 +94,9 @@ class SaasSettingsStore(SettingsStore):
             }
             self._decrypt_kwargs(kwargs)
             settings = Settings(**kwargs)
+
+            settings.v1_enabled = True
+
             return settings
 
     async def store(self, item: Settings):
diff --git a/frontend/src/components/v1/chat/event-content-helpers/should-render-event.ts b/frontend/src/components/v1/chat/event-content-helpers/should-render-event.ts
index a5fdc62252..1171c21c92 100644
--- a/frontend/src/components/v1/chat/event-content-helpers/should-render-event.ts
+++ b/frontend/src/components/v1/chat/event-content-helpers/should-render-event.ts
@@ -18,6 +18,10 @@ export const shouldRenderEvent = (event: OpenHandsEvent) => {
     // For V1, action is an object with kind property
     const actionType = event.action.kind;
 
+    if (!actionType) {
+      return false;
+    }
+
     // Hide user commands from the chat interface
     if (actionType === "ExecuteBashAction" && event.source === "user") {
       return false;
diff --git a/frontend/src/components/v1/chat/event-message-components/observation-pair-event-message.tsx b/frontend/src/components/v1/chat/event-message-components/observation-pair-event-message.tsx
index aa0bbc09b4..221d758dd6 100644
--- a/frontend/src/components/v1/chat/event-message-components/observation-pair-event-message.tsx
+++ b/frontend/src/components/v1/chat/event-message-components/observation-pair-event-message.tsx
@@ -34,7 +34,12 @@ export function ObservationPairEventMessage({
     .map((t) => t.text)
     .join("\n");
 
-  if (thoughtContent && event.action.kind !== "ThinkAction") {
+  // Defensive check: ensure action exists and has kind property
+  if (
+    thoughtContent &&
+    event.action?.kind &&
+    event.action.kind !== "ThinkAction"
+  ) {
     return (
       <div>
         <ChatMessage type="agent" message={thoughtContent} actions={actions} />
diff --git a/frontend/src/types/v1/type-guards.ts b/frontend/src/types/v1/type-guards.ts
index ee831ea489..dec1816209 100644
--- a/frontend/src/types/v1/type-guards.ts
+++ b/frontend/src/types/v1/type-guards.ts
@@ -54,7 +54,10 @@ export const isObservationEvent = (
 ): event is ObservationEvent =>
   event.source === "environment" &&
   "action_id" in event &&
-  "observation" in event;
+  "observation" in event &&
+  event.observation !== null &&
+  typeof event.observation === "object" &&
+  "kind" in event.observation;
 
 /**
  * Type guard function to check if an event is an agent error event
@@ -94,6 +97,9 @@ export const isUserMessageEvent = (
 export const isActionEvent = (event: OpenHandsEvent): event is ActionEvent =>
   event.source === "agent" &&
   "action" in event &&
+  event.action !== null &&
+  typeof event.action === "object" &&
+  "kind" in event.action &&
   "tool_name" in event &&
   "tool_call_id" in event &&
   typeof event.tool_name === "string" &&