diff --git a/CHANGELOG.md b/CHANGELOG.md
index c7daa527b8..c9b4d70971 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -40,6 +40,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed problem with not showing error message when placing an order fails - @qiqqq
 - Invoking afterCacheInvalidated server hook in a proper moment - @Fifciu (#4176)
 - Fixed `cart/isVirtualCart` to return `false` when cart is empty - @haelbichalex(#4182)
+- Use `setProductGallery` in `product/setCurrent` to use logic of the action - @cewald (#4153)
 
 ### Changed / Improved
 
diff --git a/core/modules/catalog/store/product/actions.ts b/core/modules/catalog/store/product/actions.ts
index c69c8580c5..53431af7ac 100644
--- a/core/modules/catalog/store/product/actions.ts
+++ b/core/modules/catalog/store/product/actions.ts
@@ -575,7 +575,7 @@ const actions: ActionTree<ProductState, RootState> = {
       const productUpdated = Object.assign({}, originalProduct, productVariant)
       populateProductConfigurationAsync(context, { product: productUpdated, selectedVariant: productVariant })
       if (!config.products.gallery.mergeConfigurableChildren) {
-        context.commit(types.PRODUCT_SET_GALLERY, attributeImages(productVariant))
+        context.dispatch('setProductGallery', { product: productUpdated })
       }
       context.commit(types.PRODUCT_SET_CURRENT, Object.assign({}, productUpdated))
       return productUpdated