diff --git a/web/src/elements/EmptyState.ts b/web/src/elements/EmptyState.ts
index 6611037b9bc6..d2000d25a149 100644
--- a/web/src/elements/EmptyState.ts
+++ b/web/src/elements/EmptyState.ts
@@ -22,7 +22,7 @@ export class EmptyState extends AKElement {
     fullHeight = false;
 
     @property()
-    header = "";
+    header?: string;
 
     static get styles(): CSSResult[] {
         return [
@@ -51,7 +51,7 @@ export class EmptyState extends AKElement {
                           aria-hidden="true"
                       ></i>`}
                 <h1 class="pf-c-title pf-m-lg">
-                    ${this.loading && this.header === "" ? msg("Loading") : this.header}
+                    ${this.loading && this.header === undefined ? msg("Loading") : this.header}
                 </h1>
                 <div class="pf-c-empty-state__body">
                     <slot name="body"></slot>
diff --git a/web/src/elements/LoadingOverlay.ts b/web/src/elements/LoadingOverlay.ts
index 482b919c6115..1165609ead85 100644
--- a/web/src/elements/LoadingOverlay.ts
+++ b/web/src/elements/LoadingOverlay.ts
@@ -33,7 +33,7 @@ export class LoadingOverlay extends AKElement {
     }
 
     render(): TemplateResult {
-        return html`<ak-empty-state ?loading="${true}">
+        return html`<ak-empty-state loading header="">
             <slot name="body" slot="body"></slot>
         </ak-empty-state>`;
     }
diff --git a/web/src/flow/FlowExecutor.ts b/web/src/flow/FlowExecutor.ts
index 7de56ea4cdc7..43ece9d5c70f 100644
--- a/web/src/flow/FlowExecutor.ts
+++ b/web/src/flow/FlowExecutor.ts
@@ -436,13 +436,12 @@ export class FlowExecutor extends Interface implements StageHost {
                 alt="authentik Logo"
             />
         </div>`;
-        const fallback = html`${logo}<ak-empty-state loading> </ak-empty-state>`;
-        if (!this.challenge) {
-            return fallback;
-        }
+        const fallback = html`<ak-empty-state loading> </ak-empty-state>`;
         return html`
-            ${this.loading ? html`<ak-loading-overlay></ak-loading-overlay>` : nothing} ${logo}
-            ${until(this.renderChallenge(), fallback)}
+            ${this.loading && this.challenge
+                ? html`<ak-loading-overlay></ak-loading-overlay>`
+                : nothing}
+            ${logo} ${until(this.renderChallenge(), fallback)}
         `;
     }
 
diff --git a/web/src/flow/stages/authenticator_sms/AuthenticatorSMSStage.ts b/web/src/flow/stages/authenticator_sms/AuthenticatorSMSStage.ts
index 97e80722ad93..2e656442aa6d 100644
--- a/web/src/flow/stages/authenticator_sms/AuthenticatorSMSStage.ts
+++ b/web/src/flow/stages/authenticator_sms/AuthenticatorSMSStage.ts
@@ -109,7 +109,6 @@ export class AuthenticatorSMSStage extends BaseStage<
                         class="pf-c-form__group"
                         .errors=${(this.challenge?.responseErrors || {})["code"]}
                     >
-                        <!-- @ts-ignore -->
                         <input
                             type="text"
                             name="code"