diff --git a/blocks/post-content-container/build/render.php b/blocks/post-content-container/build/render.php
index 824ae08..82583a2 100644
--- a/blocks/post-content-container/build/render.php
+++ b/blocks/post-content-container/build/render.php
@@ -1,9 +1,13 @@
 <?php
-$relatedPostId = $attributes['relatedPostId'] ?? null;
-$relatedPost = get_post($relatedPostId);
-$anchor = !empty($attributes['anchor']) ? esc_html($attributes['anchor']) : "post-content-container-" .  $attributes['relatedPostId'];
-$content = get_the_content(null, null, $relatedPost);
 
+$relatedPostId = isset($attributes['relatedPostId']) ? $attributes['relatedPostId'] : null;
+if (!$relatedPostId) return;
+
+$relatedPost = get_post($relatedPostId) ?? null;
+$anchor = isset($attributes['anchor']) && !empty($attributes['anchor']) ? esc_html($attributes['anchor']) : "post-content-container-" .  $attributes['relatedPostId'];
+
+$anchor = isset($attributes['anchor']) && !empty($attributes['anchor']) ? esc_html($attributes['anchor']) : ($relatedPostId ? "post-content-container-" . $relatedPostId : '');
+$content = get_the_content(null, null, $relatedPost);
 
 if ($relatedPost) {
 	// Temporarily set up the global post variable so the_content works as expected
diff --git a/blocks/post-content-container/src/render.php b/blocks/post-content-container/src/render.php
index 824ae08..82583a2 100644
--- a/blocks/post-content-container/src/render.php
+++ b/blocks/post-content-container/src/render.php
@@ -1,9 +1,13 @@
 <?php
-$relatedPostId = $attributes['relatedPostId'] ?? null;
-$relatedPost = get_post($relatedPostId);
-$anchor = !empty($attributes['anchor']) ? esc_html($attributes['anchor']) : "post-content-container-" .  $attributes['relatedPostId'];
-$content = get_the_content(null, null, $relatedPost);
 
+$relatedPostId = isset($attributes['relatedPostId']) ? $attributes['relatedPostId'] : null;
+if (!$relatedPostId) return;
+
+$relatedPost = get_post($relatedPostId) ?? null;
+$anchor = isset($attributes['anchor']) && !empty($attributes['anchor']) ? esc_html($attributes['anchor']) : "post-content-container-" .  $attributes['relatedPostId'];
+
+$anchor = isset($attributes['anchor']) && !empty($attributes['anchor']) ? esc_html($attributes['anchor']) : ($relatedPostId ? "post-content-container-" . $relatedPostId : '');
+$content = get_the_content(null, null, $relatedPost);
 
 if ($relatedPost) {
 	// Temporarily set up the global post variable so the_content works as expected