diff --git a/src/com/android/managedprovisioning/uiflows/PreProvisioningController.java b/src/com/android/managedprovisioning/uiflows/PreProvisioningController.java
index dae288f..06135d2 100644
--- a/src/com/android/managedprovisioning/uiflows/PreProvisioningController.java
+++ b/src/com/android/managedprovisioning/uiflows/PreProvisioningController.java
@@ -251,7 +251,8 @@
         if (mKeyguardManager.inKeyguardRestrictedInputMode()) {
             ProvisionLogger.logi("Cannot pick wifi because the screen is locked.");
             // Have the user pick a wifi network if necessary.
-        } else if (!mUtils.isConnectedToNetwork(mContext) && mParams.wifiInfo == null) {
+        } else if (!mUtils.isConnectedToNetwork(mContext) && mParams.wifiInfo == null
+               && mParams.deviceAdminDownloadInfo != null) {
             if (canRequestWifiPick()) {
                 mUi.requestWifiPick();
                 return;