diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index d3add99..45f2754 100755
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -110,6 +110,11 @@
         if ($elementtype == 'company') $table='societe_extrafields';
         if ($elementtype == 'contact') $table='socpeople_extrafields';
         if ($elementtype == 'product') $table='product_extrafields';
+
+        // Check if table of extrafields exists
+        $info_table = $this->db->DDLInfoTable('llx_'.$elementtype.'_extrafields');
+        if (is_array($info_table) && count($info_table) > 0) $table = $elementtype.'_extrafields';
+
         if (empty($table))
         {
             print 'ErrorBarValueForParameters';