diff --git a/component/admin/language/en-GB/en-GB.com_redshop.ini b/component/admin/language/en-GB/en-GB.com_redshop.ini
index 9fe1caf836f..2d7705e9129 100644
--- a/component/admin/language/en-GB/en-GB.com_redshop.ini
+++ b/component/admin/language/en-GB/en-GB.com_redshop.ini
@@ -1695,6 +1695,9 @@ COM_REDSHOP_TOOLTIP_PRODUCT_EXPIRED_LBL="Product Expired"
 COM_REDSHOP_PRODUCT_NOT_FOR_SALE="Product not for sell"
 COM_REDSHOP_TOOLTIP_PRODUCT_NOT_FOR_SALE="Product Not For Sell"
 COM_REDSHOP_TOOLTIP_PRODUCT_NOT_FOR_SALE_LBL="Product Not For Sell"
+COM_REDSHOP_PRODUCT_NOT_FOR_SALE_SHOWPRICE="Product not for sell will show price?"
+COM_REDSHOP_TOOLTIP_PRODUCT_NOT_FOR_SALE_SHOWPRICE="Product not for sell will show price?"
+COM_REDSHOP_TOOLTIP_PRODUCT_NOT_FOR_SALE_SHOWPRICE_LBL="Product not for sell will show price?"
 COM_REDSHOP_PRODUCT_PREORDER="Product Pre-Order"
 COM_REDSHOP_TOOLTIP_PRODUCT_PREORDER="Select 'Yes' if you want your customers to be able to pre-order products."
 COM_REDSHOP_TOOLTIP_PRODUCT_PRICE="Enter product price."
diff --git a/component/admin/models/product.php b/component/admin/models/product.php
index c3ad3e4f094..7e103e7a016 100644
--- a/component/admin/models/product.php
+++ b/component/admin/models/product.php
@@ -173,7 +173,7 @@ public function _buildQuery()
 			}
 			elseif ($product_sort == 'p.not_for_sale')
 			{
-				$and = 'AND p.not_for_sale=1 ';
+				$and = 'AND p.not_for_sale > 0 ';
 			}
 			elseif ($product_sort == 'p.product_not_on_sale')
 			{
diff --git a/component/admin/models/product_detail.php b/component/admin/models/product_detail.php
index 587c13c8f2f..60930136a4a 100644
--- a/component/admin/models/product_detail.php
+++ b/component/admin/models/product_detail.php
@@ -457,6 +457,12 @@ public function store($data)
 			JFile::upload($src, $dest);
 		}
 
+		// Product not for sell - Show price or not
+		if ($row->not_for_sale && $data['not_for_sale_showprice'])
+		{
+			$row->not_for_sale = 2;
+		}
+
 		$isNew = ($row->product_id > 0) ? false : true;
 
 		JPluginHelper::importPlugin('redshop_product');
diff --git a/component/admin/views/product_detail/tmpl/default_general_data.php b/component/admin/views/product_detail/tmpl/default_general_data.php
index 5c91d78e410..1f513063107 100644
--- a/component/admin/views/product_detail/tmpl/default_general_data.php
+++ b/component/admin/views/product_detail/tmpl/default_general_data.php
@@ -31,6 +31,26 @@ function (response) {
             document.formvalidator.setHandler("productNumber", function (value) {
                 return !productNumber.contains(value);
             });
+
+            if ($('input[name=not_for_sale]:checked').val() == 1)
+            {
+                $('#not_for_sale_showprice').show();
+            }
+            else
+            {
+                $('#not_for_sale_showprice').hide();
+            }
+
+            $('input[name=not_for_sale]').change(function () {
+                if ($(this).val() == 1)
+                {
+                    $('#not_for_sale_showprice').show(500);
+                }
+                else
+                {
+                    $('#not_for_sale_showprice').hide(500);
+                }
+            })
         });
     })(jQuery);
 </script>
@@ -59,7 +79,8 @@ function (response) {
 
                         <div class="form-group">
                             <label for="product_number" id="product_number-lbl">
-								<?php echo JText::_('COM_REDSHOP_PRODUCT_NUMBER') ?><span class="star text-danger"> *</span>
+								<?php echo JText::_('COM_REDSHOP_PRODUCT_NUMBER') ?><span
+                                        class="star text-danger"> *</span>
 								<?php echo JHtml::tooltip(JText::_('COM_REDSHOP_TOOLTIP_PRODUCT_NUMBER'), JText::_('COM_REDSHOP_PRODUCT_NUMBER'), 'tooltip.png', '', '', false); ?>
                             </label>
                             <input class="form-control validate-productNumber"
@@ -87,6 +108,23 @@ function (response) {
 							<?php echo $this->lists['categories']; ?>
                         </div>
 
+                        <div class="form-group">
+                            <label for="product_type">
+								<?php echo JText::_('COM_REDSHOP_PRODUCT_TYPE'); ?>
+								<?php
+								echo JHtml::tooltip(
+									JText::_('COM_REDSHOP_PRODUCT_TYPE_TIP'),
+									JText::_('COM_REDSHOP_PRODUCT_TYPE'),
+									'tooltip.png',
+									'',
+									'',
+									false
+								);
+								?>
+                            </label>
+							<?php echo $this->lists['product_type']; ?>
+                        </div>
+
                         <div class="form-group">
                             <label for="product_template">
 								<?php echo JText::_('COM_REDSHOP_PRODUCT_TEMPLATE'); ?>
@@ -440,14 +478,6 @@ function (response) {
 					<?php echo $this->lists['supplier']; ?>
                 </div>
 
-                <div class="form-group">
-                    <label for="product_type">
-						<?php echo JText::_('COM_REDSHOP_PRODUCT_TYPE'); ?>
-						<?php echo JHtml::tooltip(JText::_('COM_REDSHOP_PRODUCT_TYPE_TIP'), JText::_('COM_REDSHOP_PRODUCT_TYPE'), 'tooltip.png', '', '', false); ?>
-                    </label>
-					<?php echo $this->lists['product_type']; ?>
-                </div>
-
                 <div class="form-group">
                     <label for="product_parent_id">
 						<?php echo JText::_('COM_REDSHOP_PARENT_PRODUCT'); ?>
@@ -519,6 +549,23 @@ function (response) {
 					<?php echo $this->lists['not_for_sale']; ?>
                 </div>
 
+                <div class="form-group" id="not_for_sale_showprice">
+                    <label for="not_for_sale_showprice0">
+			            <?php echo JText::_('COM_REDSHOP_PRODUCT_NOT_FOR_SALE_SHOWPRICE'); ?>
+			            <?php
+			            echo JHtml::tooltip(
+				            JText::_('COM_REDSHOP_TOOLTIP_PRODUCT_NOT_FOR_SALE_SHOWPRICE'),
+				            JText::_('COM_REDSHOP_TOOLTIP_PRODUCT_NOT_FOR_SALE_SHOWPRICE_LBL'),
+				            'tooltip.png',
+				            '',
+				            '',
+				            false
+			            );
+			            ?>
+                    </label>
+		            <?php echo $this->lists['not_for_sale_showprice']; ?>
+                </div>
+
                 <div class="form-group">
                     <label for="preorder">
 						<?php echo JText::_('COM_REDSHOP_PRODUCT_PREORDER'); ?>
diff --git a/component/admin/views/product_detail/view.html.php b/component/admin/views/product_detail/view.html.php
index 04ec07708b8..f700321f40b 100644
--- a/component/admin/views/product_detail/view.html.php
+++ b/component/admin/views/product_detail/view.html.php
@@ -430,7 +430,18 @@ public function display($tpl = null)
 		$lists['copy_attribute'] = JHtml::_('select.booleanlist', 'copy_attribute', 'class="inputbox"', 0);
 		$lists['product_special'] = JHtml::_('select.booleanlist', 'product_special', 'class="inputbox"', $detail->product_special);
 		$lists['product_download'] = JHtml::_('select.booleanlist', 'product_download', 'class="inputbox"', $detail->product_download);
-		$lists['not_for_sale'] = JHtml::_('select.booleanlist', 'not_for_sale', 'class="inputbox"', $detail->not_for_sale);
+
+		$detail->not_for_sale_showprice = 0;
+
+		if ($detail->not_for_sale == 2)
+		{
+			$detail->not_for_sale = 1;
+			$detail->not_for_sale_showprice = 1;
+		}
+
+		$lists['not_for_sale']           = JHtml::_('select.booleanlist', 'not_for_sale', 'class="inputbox"', $detail->not_for_sale);
+		$lists['not_for_sale_showprice'] = JHtml::_('select.booleanlist', 'not_for_sale_showprice', 'class="inputbox"', $detail->not_for_sale_showprice);
+
 		$lists['expired'] = JHtml::_('select.booleanlist', 'expired', 'class="inputbox"', $detail->expired);
 		$lists['allow_decimal_piece'] = JHtml::_('select.booleanlist', 'allow_decimal_piece', 'class="inputbox"', $detail->allow_decimal_piece);
 
diff --git a/component/site/helpers/producthelper.php b/component/site/helpers/producthelper.php
index a62babf8e47..bc221c59c88 100644
--- a/component/site/helpers/producthelper.php
+++ b/component/site/helpers/producthelper.php
@@ -3753,7 +3753,14 @@ public function getProductOnSaleComment($product = array(), $data_add = "")
 
 	public function getProductNotForSaleComment($product = array(), $data_add = "", $attributes = array(), $is_relatedproduct = 0, $seoTemplate = "")
 	{
-		if (!$product->not_for_sale)
+		$showPrice = true;
+
+		if ($product->expired || $product->not_for_sale == 1)
+		{
+			$showPrice = false;
+		}
+
+		if ($showPrice)
 		{
 			// Product show price without formatted
 			$applytax = $this->getApplyVatOrNot($data_add);
diff --git a/component/site/models/cart.php b/component/site/models/cart.php
index b8cad628ad8..3841997487a 100644
--- a/component/site/models/cart.php
+++ b/component/site/models/cart.php
@@ -552,7 +552,7 @@ public function redmasscart($post)
 				continue;
 			}
 
-			if ($product->not_for_sale == 1)
+			if ($product->not_for_sale > 0)
 			{
 				$msg = sprintf(JText::_('COM_REDSHOP_PRODUCT_IS_NOT_FOR_SALE'), $product->product_name, $product_id);
 				JError::raiseWarning(20, $msg);