diff --git a/dashboard-ui/scripts/wizardlivetvguide.js b/dashboard-ui/scripts/wizardlivetvguide.js
index a53adef59..585c71e93 100644
--- a/dashboard-ui/scripts/wizardlivetvguide.js
+++ b/dashboard-ui/scripts/wizardlivetvguide.js
@@ -12,7 +12,7 @@
 
             var providerId = null;
 
-            if (config.LiveTvGuideProviderType.toLowerCase() == type.toLowerCase()) {
+            if ((config.LiveTvGuideProviderType || '').toLowerCase() == type.toLowerCase()) {
                 if (config.LiveTvGuideProviderId) {
                     providerId = config.LiveTvGuideProviderId;
                 }
diff --git a/dashboard-ui/scripts/wizardlivetvtuner.js b/dashboard-ui/scripts/wizardlivetvtuner.js
index bc2dadd15..86ec3079e 100644
--- a/dashboard-ui/scripts/wizardlivetvtuner.js
+++ b/dashboard-ui/scripts/wizardlivetvtuner.js
@@ -35,7 +35,7 @@
 
         apiClient.getJSON(apiClient.getUrl('Startup/Configuration')).done(function (config) {
 
-            $('#selectTunerType', page).val(config.LiveTvTunerType || '').selectmenu("refresh");
+            $('#selectTunerType', page).val(config.LiveTvTunerType || 'hdhomerun').selectmenu("refresh");
             page.querySelector('.txtDevicePath').value = config.LiveTvTunerPath || '';
 
             Dashboard.hideLoadingMsg();