diff --git a/src/com/cyanogenmod/setupwizard/util/SetupWizardUtils.java b/src/com/cyanogenmod/setupwizard/util/SetupWizardUtils.java
index 20c8a5a8..7209b805 100644
--- a/src/com/cyanogenmod/setupwizard/util/SetupWizardUtils.java
+++ b/src/com/cyanogenmod/setupwizard/util/SetupWizardUtils.java
@@ -75,6 +75,7 @@ public class SetupWizardUtils {
 
     private static final String GMS_PACKAGE = "com.google.android.gms";
     private static final String GMS_SUW_PACKAGE = "com.google.android.setupwizard";
+    private static final String GMS_TV_SUW_PACKAGE = "com.google.android.tungsten.setupwraith";
 
     private SetupWizardUtils(){}
 
@@ -251,6 +252,13 @@ public class SetupWizardUtils {
         if (!SetupWizardUtils.hasWifi(context)) {
             disableComponent(context, WifiSetupActivity.class);
         }
+
+        // Googles ATV SUW crashes before finishing, leaving devices
+        // unprovisioned. Disable it for now.
+        if (hasLeanback(context) &&
+            PackageManagerUtils.isAppInstalled(context, GMS_TV_SUW_PACKAGE)) {
+            disableApplication(context, GMS_TV_SUW_PACKAGE);
+        }
     }
 
     public static void disableComponentsForGMS(Context context) {
@@ -278,6 +286,11 @@ public class SetupWizardUtils {
         return comp;
     }
 
+    public static void disableApplication(Context context, String appname) {
+        context.getPackageManager().setApplicationEnabledSetting(appname,
+                COMPONENT_ENABLED_STATE_DISABLED, 0);
+    }
+
     public static void disableComponentSets(Context context, int flags) {
         setComponentListEnabledState(context, getComponentSets(context, flags),
                 COMPONENT_ENABLED_STATE_DISABLED);