diff --git a/entityform.module b/entityform.module
index 80df682..fcd76c6 100644
--- a/entityform.module
+++ b/entityform.module
@@ -1446,9 +1446,12 @@ function _entityform_type_get_path_types($type) {
  */
 function entityform_views_pre_view(&$view, &$display_id, &$args) {
   if ($view->base_table == 'entityform' && strpos($display_id, 'autofields_') === 0) {
+    if (empty($view->display[$display_id]->entityform_settings['autofields'])) {
       $type = $view->args[0];
       _entityform_view_add_all_fields($view, $display_id, $type);
     }
+
+  }
   return;
 }