diff --git a/panopoly_magic.module b/panopoly_magic.module
index c4b68c2..7329a08 100644
--- a/panopoly_magic.module
+++ b/panopoly_magic.module
@@ -776,7 +776,7 @@ function panopoly_magic_form_views_content_views_panes_content_type_edit_form_al
   $form['content_settings']['view_mode'] = array(
     '#type' => 'radios',
     '#options' => panopoly_magic_view_mode_options(),
-    '#default_value' => $conf['view_mode'] ? $conf['view_mode'] : 'teaser',
+    '#default_value' => $conf['view_mode'] ? $conf['view_mode'] : '',
     '#states' => array(
       'visible' => array(
         ':input[name="view_settings"]' => array('value' => 'nodes'),
@@ -1275,7 +1275,8 @@ function panopoly_magic_process_panels_add_content_modal(&$vars) {
  */
 function panopoly_magic_view_mode_options() {
   $entity_info = entity_get_info('node');
-  $options = array();
+  // Add an empty default value to not override the view mode.
+  $options = array('' => t('Default (use configured view mode)'));
   if (!empty($entity_info['view modes'])) {
     foreach ($entity_info['view modes'] as $mode => $settings) {
       if (!in_array($mode, array('rss', 'search_index', 'search_result', 'token'))) {