diff --git a/CRM/Export/Form/Select.php b/CRM/Export/Form/Select.php
index 408aee39cc23..3e36b238ca93 100644
--- a/CRM/Export/Form/Select.php
+++ b/CRM/Export/Form/Select.php
@@ -157,6 +157,10 @@ public function preProcess() {
         break;
     }
 
+    if (empty($entityDAOName)) {
+      $entityDAOName = $entityShortname;
+    }
+
     if (in_array($entityShortname, $components)) {
       $this->_exportMode = constant('CRM_Export_Form_Select::' . strtoupper($entityShortname) . '_EXPORT');
       $formTaskClassName = "CRM_{$entityShortname}_Form_Task";
@@ -184,7 +188,7 @@ public function preProcess() {
       $values = $this->controller->exportValues('Custom');
     }
     else {
-      if (in_array($entityShortname, $components)) {
+      if (in_array($entityShortname, $components) && $entityShortname !== 'Contact') {
         $values = $this->controller->exportValues('Search');
       }
       else {