diff --git a/.github/workflows/ide.yml b/.github/workflows/ide.yml
index ceabb0fef..f746198a5 100644
--- a/.github/workflows/ide.yml
+++ b/.github/workflows/ide.yml
@@ -16,13 +16,10 @@ jobs:
       uses: shivammathur/setup-php@v2
       with:
         php-version: '7.3'
-        tools: composer:v1, prestissimo, pecl
-        extensions: bcmath, gd, pdo_mysql, zip, soap
+        tools: composer:v2, prestissimo, pecl
+        extensions: bcmath, gd, pdo_mysql, zip, soap, ast
         coverage: none
 
-    - name: Install AST extension
-      run: sudo pecl install -f ast
-
       #https://github.com/actions/cache/blob/master/examples.md#php---composer
     - name: Cache composer packages
       id: composer-cache
@@ -46,16 +43,10 @@ jobs:
         composer install --prefer-dist --no-progress --no-suggest
     ############################################################################
 
-    # Not removing HHVM will lead to the following error:
-    # > Installation request for hhvm 4.49.0 -> satisfiable by hhvm[4.49.0].
-    - name: Remove HHVM
-      id: remove-hhvm
-      run: sudo apt remove hhvm
-
     - name: Install Magento
       id: install-magento
       run: |
-        composer create-project magento/community-edition=2.4.1 magento
+        composer create-project magento/community-edition=2.4.2 magento --no-dev
         cd magento
         composer config minimum-stability dev
         composer config prefer-stable true
diff --git a/.github/workflows/phan.yml b/.github/workflows/phan.yml
index 99a01e91b..61e8b1c14 100644
--- a/.github/workflows/phan.yml
+++ b/.github/workflows/phan.yml
@@ -16,7 +16,7 @@ jobs:
       uses: shivammathur/setup-php@v2
       with:
         php-version: '7.3'
-        tools: composer:v1, prestissimo, pecl
+        tools: composer:v2, prestissimo, pecl
         coverage: none
         extensions: ast, bcmath, gd, pdo_mysql, zip, soap
 
@@ -42,16 +42,10 @@ jobs:
         composer install --prefer-dist --no-progress --no-suggest
     ############################################################################
 
-    # Not removing HHVM will lead to the following error:
-    # > Installation request for hhvm 4.49.0 -> satisfiable by hhvm[4.49.0].
-    - name: Remove HHVM
-      id: remove-hhvm
-      run: sudo apt remove hhvm
-
     - name: Install Magento
       id: install-magento
       run: |
-        composer create-project magento/community-edition=2.4.1 magento
+        composer create-project magento/community-edition=2.4.2 magento --no-dev
         cd magento
         composer config minimum-stability dev
         composer config prefer-stable true
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d87fb764d..39eec872e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 All notable changes to this project will be documented in this file. This project adheres to Semantic Versioning.
 
+### 5.2.4
+* Fix order tagging rendering in case variation tags were missing
+
 ### 5.2.3
 * Pass correct product id when adding grouped product to cart
 
diff --git a/composer.json b/composer.json
index 56e274364..27652109b 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
   "name": "nosto/module-nostotagging",
   "description": "Increase your conversion rate and average order value by delivering your customers personalized product recommendations throughout their shopping journey.",
   "type": "magento2-module",
-  "version": "5.2.3",
+  "version": "5.2.4",
   "require-dev": {
     "phpmd/phpmd": "^2.5",
     "sebastian/phpcpd": "*",
diff --git a/etc/module.xml b/etc/module.xml
index 99f17ad53..d9422c582 100755
--- a/etc/module.xml
+++ b/etc/module.xml
@@ -37,5 +37,5 @@
 <!--suppress XmlUnboundNsPrefix -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Nosto_Tagging" setup_version="5.2.3"/>
+    <module name="Nosto_Tagging" setup_version="5.2.4"/>
 </config>
diff --git a/view/frontend/web/js/view/variation-tagging.js b/view/frontend/web/js/view/variation-tagging.js
index 35cc78ca9..219d2e115 100644
--- a/view/frontend/web/js/view/variation-tagging.js
+++ b/view/frontend/web/js/view/variation-tagging.js
@@ -53,8 +53,10 @@ define([
     reloadRecommendations: function () {
       // Remove the static variation if it exists - it should not but as a safeguard we rename the class
       const element = document.querySelector(".nosto_variation");
-      element.classList.remove('nosto_variation');
-      element.classList.add('nosto_variation_static');
+      if (element) {
+        element.classList.remove('nosto_variation');
+        element.classList.add('nosto_variation_static');
+      }
       document.querySelector(".nosto_variation_dynamic").classList.add("nosto_variation")
       if (typeof nostojs === 'function') {
         nostojs(function (api) {