diff --git a/src/org/lineageos/setupwizard/util/SetupWizardUtils.java b/src/org/lineageos/setupwizard/util/SetupWizardUtils.java
index 85f8cb53..3ae69ebc 100644
--- a/src/org/lineageos/setupwizard/util/SetupWizardUtils.java
+++ b/src/org/lineageos/setupwizard/util/SetupWizardUtils.java
@@ -202,6 +202,10 @@ public class SetupWizardUtils {
                 Settings.Global.DEVICE_PROVISIONED, 1);
         Settings.Secure.putInt(contentResolver,
                 Settings.Secure.USER_SETUP_COMPLETE, 1);
+        if (hasLeanback(context)) {
+            Settings.Secure.putInt(contentResolver,
+                    Settings.Secure.TV_USER_SETUP_COMPLETE, 1);
+        }
 
         disableComponent(context, WizardManager.class);
         disableHome(context);