diff --git a/components/blocks/BlocksView.vue b/components/blocks/BlocksView.vue
index 3990da8..b9bd23d 100644
--- a/components/blocks/BlocksView.vue
+++ b/components/blocks/BlocksView.vue
@@ -7,6 +7,7 @@
         class="justify-center my-0"
       >
         <v-col
+          v-if="!block.hiddenByPaywall"
           class="col-auto w-100 px-sm-0"
           :class="{
             'max-width-520': isBoxed520(block),
diff --git a/components/wepPublication/WepPublication.vue b/components/wepPublication/WepPublication.vue
index 154a97f..e8b803d 100644
--- a/components/wepPublication/WepPublication.vue
+++ b/components/wepPublication/WepPublication.vue
@@ -298,6 +298,9 @@ export default Vue.extend({
         return this.publication?.preTitle
       }
       return undefined
+    },
+    loggedIn (): boolean {
+      return this.$store.getters['auth/hasAccess']
     }
   },
   watch: {
@@ -325,6 +328,12 @@ export default Vue.extend({
       },
       deep: false,
       immediate: true
+    },
+    loggedIn: {
+      handler () {
+        this.removeBlocksForPaywall()
+      },
+      deep: true
     }
   },
   async mounted () {
@@ -370,6 +379,8 @@ export default Vue.extend({
     // remove blocks and add fadeout overlay
     removeBlocksForPaywall (): void {
       if (!this.paywallRulesGiven()) {
+        // fix from https://wepublish.atlassian.net/browse/HAS-25
+        this.revealRemovedBlocks()
         return
       }
       const blocks = this.publication.blocks
@@ -392,6 +403,12 @@ export default Vue.extend({
         this.showPaywall = false
       }
     },
+    revealRemovedBlocks (): void {
+      this.publication.blocks?.revealRemovedBlocks()
+      this.showPaywall = false
+      // remove articleId param in case logged-in user want's to share the article with non-logged-in users
+      this.$router.replace(this.$route.path)
+    },
     addPaywallBlock (paywalls: Paywalls): void {
       if (!this.paywallRulesGiven()) {
         return
diff --git a/sdk/wep/models/block/Block.ts b/sdk/wep/models/block/Block.ts
index 5334cf8..af6bfa2 100644
--- a/sdk/wep/models/block/Block.ts
+++ b/sdk/wep/models/block/Block.ts
@@ -19,12 +19,15 @@ export type BlockTypename =
 
 export interface BlockProps {
   __typename: BlockTypename
+  hiddenByPaywall?: boolean
 }
 
 export default class Block {
   public __typename: BlockTypename
+  public hiddenByPaywall?: boolean
 
-  constructor({__typename}: BlockProps) {
+  constructor({__typename, hiddenByPaywall}: BlockProps) {
     this.__typename = __typename
+    this.hiddenByPaywall = !!hiddenByPaywall
   }
 }
diff --git a/sdk/wep/models/block/Blocks.ts b/sdk/wep/models/block/Blocks.ts
index 63ba549..47d17cb 100644
--- a/sdk/wep/models/block/Blocks.ts
+++ b/sdk/wep/models/block/Blocks.ts
@@ -103,9 +103,15 @@ export default class Blocks {
   }
 
   public removeBlocks(blocksLeft: number): void {
-    while (this.blocks.length > blocksLeft) {
-      this.blocks.pop()
-    }
+    this.blocks.forEach((block, blockIndex) => {
+      if (blockIndex >= blocksLeft) {
+        block.hiddenByPaywall = true
+      }
+    })
+  }
+
+  public revealRemovedBlocks (): void {
+    this.blocks.forEach((block) => block.hiddenByPaywall = false)
   }
 
   public getLastBlock(): BlockTypes {