diff --git a/src/com/cyanogenmod/setupwizard/util/SetupWizardUtils.java b/src/com/cyanogenmod/setupwizard/util/SetupWizardUtils.java
index d98aef83..fb36f96a 100644
--- a/src/com/cyanogenmod/setupwizard/util/SetupWizardUtils.java
+++ b/src/com/cyanogenmod/setupwizard/util/SetupWizardUtils.java
@@ -250,7 +250,8 @@ public class SetupWizardUtils {
             disableComponent(context, MobileDataActivity.class);
             disableComponent(context, SimMissingActivity.class);
             disableComponent(context, ChooseDataSimActivity.class);
-        } else if (!SetupWizardUtils.isMultiSimDevice(context)) {
+        }
+        if (!SetupWizardUtils.isMultiSimDevice(context)) {
             disableComponent(context, ChooseDataSimActivity.class);
         } else if (simMissing()) {
             disableComponent(context, MobileDataActivity.class);