diff --git a/src/data/google_assistant.ts b/src/data/google_assistant.ts
index 1381e697ed..03c79e1c14 100644
--- a/src/data/google_assistant.ts
+++ b/src/data/google_assistant.ts
@@ -4,6 +4,7 @@ export interface GoogleEntity {
   entity_id: string;
   traits: string[];
   might_2fa: boolean;
+  disable_2fa?: boolean;
 }
 
 export const fetchCloudGoogleEntities = (hass: HomeAssistant) =>
diff --git a/src/panels/config/voice-assistants/entity-voice-settings.ts b/src/panels/config/voice-assistants/entity-voice-settings.ts
index 9c92bfebd0..95d129c4a7 100644
--- a/src/panels/config/voice-assistants/entity-voice-settings.ts
+++ b/src/panels/config/voice-assistants/entity-voice-settings.ts
@@ -211,7 +211,6 @@ export class EntityVoiceSettings extends SubscribeMixin(LitElement) {
               (googleManual && key === "cloud.google_assistant");
 
             const support2fa =
-              this.entry &&
               key === "cloud.google_assistant" &&
               !googleManual &&
               supported &&
@@ -256,7 +255,7 @@ export class EntityVoiceSettings extends SubscribeMixin(LitElement) {
                         )}
                       >
                         <ha-checkbox
-                          .checked=${!this.entry!.options?.[key]?.disable_2fa}
+                          .checked=${!this._googleEntity!.disable_2fa}
                           @change=${this._2faChanged}
                         ></ha-checkbox>
                       </ha-formfield>