diff --git a/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs b/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
index 37f89417c37..bcd2f6f48f2 100644
--- a/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
@@ -36,7 +36,11 @@
             label="user.second_factor.totp.add"}}
           {{#each totps as |totp|}}
             <div class="second-factor-item">
-              {{totp.name}}
+              {{#if totp.name}}
+                {{totp.name}}
+              {{else}}
+                {{i18n "user.second_factor.totp.default_name"}}
+              {{/if}}
 
               {{#if isCurrentUser}}
                 {{d-button action=(action "editSecondFactor" totp)