diff --git a/_build/build.config.php b/_build/build.config.php
index 8a641d81d..2c447edf9 100644
--- a/_build/build.config.php
+++ b/_build/build.config.php
@@ -5,7 +5,7 @@
 define('PKG_NAME_LOWER', strtolower(PKG_NAME));
 
 define('PKG_VERSION', '2.2.0');
-define('PKG_RELEASE', 'beta3');
+define('PKG_RELEASE', 'beta4');
 define('PKG_AUTO_INSTALL', true);
 
 /* define paths */
diff --git a/core/components/minishop2/docs/changelog.txt b/core/components/minishop2/docs/changelog.txt
index 9a9b7c4b0..41c8a5f85 100644
--- a/core/components/minishop2/docs/changelog.txt
+++ b/core/components/minishop2/docs/changelog.txt
@@ -1,5 +1,11 @@
 Changelog for miniShop2.
 
+2.2.0 beta4
+==============
+- Category pagination fix.
+- Fixed bug removal options when modifying and generating images of products
+- Don't display tplOuter when all options are empty with hideEmpty=1
+
 2.2.0 beta3
 ==============
 - Measure units for options.
diff --git a/core/components/minishop2/elements/snippets/snippet.ms_product_options.php b/core/components/minishop2/elements/snippets/snippet.ms_product_options.php
index 645598524..f5192fe8b 100644
--- a/core/components/minishop2/elements/snippets/snippet.ms_product_options.php
+++ b/core/components/minishop2/elements/snippets/snippet.ms_product_options.php
@@ -31,8 +31,8 @@
     $groups = array(0);
 }
 
-if(count($optionKeys) > 0){
-    $rows = array();
+$rows = array();
+if(count($optionKeys) > 0) {
     foreach ($optionKeys as $key) {
         if (in_array($key, $ignoreOptions)) continue;
         $productOption = array();
@@ -63,8 +63,10 @@
 
         $rows[] = $pdoFetch->getChunk($tplRow, array_merge($productData, $productOption));
     }
-    $rows = implode($outputSeparator, $rows);
+}
 
+if (count($rows) > 0) {
+    $rows = implode($outputSeparator, $rows);
     $output = empty($tplOuter)
         ? $pdoFetch->getChunk('', array_merge($productData, array('rows' => $rows)))
         : $pdoFetch->getChunk($tplOuter, array_merge($scriptProperties, $productData, array('rows' => $rows)));