diff --git a/extensions/apps/profile/src/components/pages/profile-beams/index.tsx b/extensions/apps/profile/src/components/pages/profile-beams/index.tsx
index 5548852c41..75de9f0abe 100644
--- a/extensions/apps/profile/src/components/pages/profile-beams/index.tsx
+++ b/extensions/apps/profile/src/components/pages/profile-beams/index.tsx
@@ -53,7 +53,7 @@ const ProfileBeamsPage: React.FC<ProfileBeamsPageProps> = props => {
                   })
                 }
                 showNSFWCard={itemData.node.nsfw}
-                showHiddenContent={true}
+                showHiddenContent={false}
               />
             );
         }}
diff --git a/libs/design-system-components/src/components/Entry/EntryCard/index.tsx b/libs/design-system-components/src/components/Entry/EntryCard/index.tsx
index b3af97c5b0..0fe989d5c0 100644
--- a/libs/design-system-components/src/components/Entry/EntryCard/index.tsx
+++ b/libs/design-system-components/src/components/Entry/EntryCard/index.tsx
@@ -189,7 +189,7 @@ const EntryCard: React.FC<EntryCardProps> = props => {
       {entryData.active && (
         <ErrorBoundary {...errorBoundaryProps}>
           <Card
-            onClick={!showNSFWContent ? null : onContentClick}
+            onClick={!showNSFWContent || !noWrapperCard ? null : onContentClick}
             customStyle={contentClickableStyle}
             type="plain"
           >
@@ -294,7 +294,12 @@ const EntryCard: React.FC<EntryCardProps> = props => {
   return noWrapperCard ? (
     <> {entryCardUi}</>
   ) : (
-    <Card ref={ref} padding="p-0" customStyle={customStyle}>
+    <Card
+      ref={ref}
+      padding="p-0"
+      customStyle={customStyle}
+      onClick={!showNSFWContent ? null : onContentClick}
+    >
       {entryCardUi}
     </Card>
   );
diff --git a/libs/design-system-components/src/components/ImageBlockGallery/image-block-grid-item.tsx b/libs/design-system-components/src/components/ImageBlockGallery/image-block-grid-item.tsx
index f66e8141e0..024a352358 100644
--- a/libs/design-system-components/src/components/ImageBlockGallery/image-block-grid-item.tsx
+++ b/libs/design-system-components/src/components/ImageBlockGallery/image-block-grid-item.tsx
@@ -38,7 +38,7 @@ export const ImageBlockGridItem: React.FC<IGridItemProps> = props => {
     >
       {/* when we have a single image we need to keep the original aspect ratio,
           otherwise give images a 1:1 ratio */}
-      <picture className={tw('flex')}>
+      <picture className={tw('flex w-full')}>
         <source srcSet={imageSrc?.originalSrc} />
 
         <img
@@ -59,7 +59,7 @@ export const ImageBlockGridItem: React.FC<IGridItemProps> = props => {
               loading="lazy"
               decoding="async"
               alt={'placeholder'}
-              className={tx(`rounded object-cover w-full  ${heightStyle} ${multipleImageStyle}`)}
+              className={tx(`rounded object-cover w-full ${heightStyle} ${multipleImageStyle}`)}
               src={'/images/image-placeholder.webp'}
               height={images.length === 1 ? imageSrc?.size?.height : ''}
             />
diff --git a/libs/feed/src/components/cards/beam-card/content-block-renderer.tsx b/libs/feed/src/components/cards/beam-card/content-block-renderer.tsx
index e8f13d2f4e..651fa33b20 100644
--- a/libs/feed/src/components/cards/beam-card/content-block-renderer.tsx
+++ b/libs/feed/src/components/cards/beam-card/content-block-renderer.tsx
@@ -29,7 +29,6 @@ const ContentBlockRenderer: React.FC<ContentBlockRendererProps> = props => {
     beamIsNsfw,
     showBlockName,
     onBlockInfoChange,
-    onContentClick,
   } = props;
   const { navigateToModal, getExtensionsPlugin, getRoutingPlugin } = useRootComponentProps();
   const contentBlockStoreRef = useRef(getExtensionsPlugin()?.contentBlockStore);
@@ -48,7 +47,6 @@ const ContentBlockRenderer: React.FC<ContentBlockRendererProps> = props => {
   }, [contentBlockReq.data]);
   const contentBlockPropertyType = blockData?.content?.[0]?.propertyType;
   const contentBlockLabel = blockData?.content?.[0]?.label;
-  const nsfw = !!blockData?.nsfw;
   useEffect(() => {
     _onBlockInfoChange.current?.({
       appName: BLOCK_LABEL_TO_APP_DISPLAY_NAME_MAP[contentBlockLabel],
@@ -94,17 +92,7 @@ const ContentBlockRenderer: React.FC<ContentBlockRendererProps> = props => {
   };
 
   return (
-    <Card
-      type="plain"
-      onClick={() => {
-        if (!(showNSFWCard && nsfw)) {
-          if (typeof onContentClick === 'function') {
-            onContentClick();
-          }
-        }
-      }}
-      customStyle="w-full"
-    >
+    <Card type="plain" customStyle="w-full">
       {!showNSFWCard && (
         <>
           <Transition
diff --git a/libs/feed/src/components/cards/beam-card/index.tsx b/libs/feed/src/components/cards/beam-card/index.tsx
index e6e2867faa..0c6cd95ca9 100644
--- a/libs/feed/src/components/cards/beam-card/index.tsx
+++ b/libs/feed/src/components/cards/beam-card/index.tsx
@@ -107,6 +107,7 @@ const BeamCard: React.FC<BeamCardProps> = props => {
         }
         onReflect();
       }}
+      onContentClick={onContentClick}
       onEntryFlag={handleFlagBeam}
       profileAvatarExt={
         <AuthorProfileAvatar
@@ -139,7 +140,6 @@ const BeamCard: React.FC<BeamCardProps> = props => {
               setAppName(blockInfo?.appName);
               setBlockNameMap(new Map(blockNameMap.set(blockID, blockInfo?.blockName)));
             }}
-            onContentClick={onContentClick}
           />
         </React.Suspense>
       )}