diff --git a/classes/OrderDetail.php b/classes/OrderDetail.php
index efe8b7b9f..fd5938d64 100644
--- a/classes/OrderDetail.php
+++ b/classes/OrderDetail.php
@@ -200,6 +200,7 @@ class OrderDetailCore extends ObjectModel
 		FROM `'._DB_PREFIX_.'order_detail` od
 		LEFT JOIN `'._DB_PREFIX_.'product_download` pd ON (od.`product_id`=pd.`id_product`)
 		WHERE od.`download_hash` = \''.pSQL(strval($hash)).'\'
+		AND od.`product_attribute_id` = pd.`id_product_attribute`
 		AND pd.`active` = 1';
 		return Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow($sql);
 	}
diff --git a/controllers/front/GetFileController.php b/controllers/front/GetFileController.php
index f06a78a18..2c1a69b92 100644
--- a/controllers/front/GetFileController.php
+++ b/controllers/front/GetFileController.php
@@ -267,7 +267,6 @@ class GetFileControllerCore extends FrontController
 				$mimeType = 'application/octet-stream';
 		}
 
-
 		/* Set headers for download */
 		header('Content-Transfer-Encoding: binary');
 		header('Content-Type: '.$mimeType);