diff --git a/classes/Product.php b/classes/Product.php
index 7b5ab6dfe..d29960ac9 100644
--- a/classes/Product.php
+++ b/classes/Product.php
@@ -4829,12 +4829,17 @@ class ProductCore extends ObjectModel
 	 */
 	public function getDefaultCategory()
 	{
-		return Db::getInstance()->getValue('
+		$default_category = Db::getInstance()->getValue('
 			SELECT product_shop.`id_category_default`
 			FROM `'._DB_PREFIX_.'product` p
 			'.Shop::addSqlAssociation('product', 'p').'
 			WHERE p.`id_product` = '.(int)$this->id);
 
+		if (!$default_category)
+			return array('id_category_default' => Context::getContext()->shop->id_category);
+		else
+			return $default_category;
+
 	}
 
 	public static function getShopsByProduct($id_product)
diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php
index 996cd8970..354efb3cc 100644
--- a/controllers/admin/AdminProductsController.php
+++ b/controllers/admin/AdminProductsController.php
@@ -2605,7 +2605,7 @@ class AdminProductsControllerCore extends AdminController
 		$data = $this->createTemplate($this->tpl_form);
 		// Prepare Categories tree for display in Associations tab
 		$root = Category::getRootCategory();
-		$default_category = Tools::getValue('id_category', Configuration::get('PS_HOME_CATEGORY'));
+		$default_category = Tools::getValue('id_category', Context::getContext()->shop->id_category);
 
 		if (!$product->id)
 			$selected_cat = Category::getCategoryInformations(Tools::getValue('categoryBox', array($default_category)), $this->default_form_language);