diff --git a/CHANGELOG.md b/CHANGELOG.md
index 64f4b46cf2..3f3ba4fb9c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -68,6 +68,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fix sortBy for the category page - @Jensderond (#2868)
 - Fixed incorrect prices in Instant Checkout (PR API) - @qiqqq (#2874)
 - Incorrect `user_id` set on the order object - @pkarw (#2966)
+- Problem with SSR render on product page with logged in user - @patzick (#2888)
 
 ### Changed / Improved
 - The action `cart/userAfterLoggedin` got renamed to `cart/authorize` - @pkarw (#2522)
diff --git a/src/themes/default/components/core/blocks/Reviews/Reviews.vue b/src/themes/default/components/core/blocks/Reviews/Reviews.vue
index 7ccd3ef840..66399e73d2 100644
--- a/src/themes/default/components/core/blocks/Reviews/Reviews.vue
+++ b/src/themes/default/components/core/blocks/Reviews/Reviews.vue
@@ -84,12 +84,14 @@
               >
                 {{ $t('Add review') }}
               </button-full>
-              <span
-                class="fs-medium ml20 cl-gray lh30 py5 block"
-                v-if="!currentUser"
-              >
-                {{ $t('or') }} <a href="#" class="cl-primary" @click.prevent="login()">{{ $t('login') }}</a> {{ $t('to account') }}
-              </span>
+              <no-ssr>
+                <span
+                  class="fs-medium ml20 cl-gray lh30 py5 block"
+                  v-if="!currentUser"
+                >
+                  {{ $t('or') }} <a href="#" class="cl-primary" @click.prevent="login()">{{ $t('login') }}</a> {{ $t('to account') }}
+                </span>
+              </no-ssr>
             </div>
           </form>
         </div>
@@ -107,6 +109,8 @@ import ButtonFull from 'theme/components/theme/ButtonFull'
 import ReviewsList from 'theme/components/theme/blocks/Reviews/ReviewsList'
 import { Reviews } from '@vue-storefront/core/modules/review/components/Reviews'
 import { AddReview } from '@vue-storefront/core/modules/review/components/AddReview'
+import NoSSR from 'vue-no-ssr'
+
 export default {
   name: 'Reviews',
   data () {
@@ -205,7 +209,8 @@ export default {
     ButtonFull,
     BaseInput,
     BaseTextarea,
-    ReviewsList
+    ReviewsList,
+    'no-ssr': NoSSR
   }
 }
 </script>