diff --git a/src16/access/pg_tdeam.c b/src16/access/pg_tdeam.c
index f3926416bc7..7a6b46bb754 100644
--- a/src16/access/pg_tdeam.c
+++ b/src16/access/pg_tdeam.c
@@ -2803,8 +2803,6 @@ l1:
 
 	old_key_tuple = ExtractReplicaIdentity(relation, decrypted_tuple, true, &old_key_copied);
 
-	tdeheap_freetuple(decrypted_tuple);
-
 	/*
 	 * If this is the first possibly-multixact-able operation in the current
 	 * transaction, set my per-backend OldestMemberMXactId setting. We can be
@@ -2942,7 +2940,15 @@ l1:
 		Assert(!HeapTupleHasExternal(&tp));
 	}
 	else if (HeapTupleHasExternal(&tp))
-		tdeheap_toast_delete(relation, &tp, false);
+	{
+		/* 
+		 * tdeheap_toast_delete needs decypted tuple to extract external 
+		 * attributes 
+		 */
+		tdeheap_toast_delete(relation, decrypted_tuple, false);
+	}
+
+	tdeheap_freetuple(decrypted_tuple);
 
 	/*
 	 * Mark tuple for invalidation from system caches at next command
diff --git a/src17/access/pg_tdeam.c b/src17/access/pg_tdeam.c
index ec2b08f01fc..0848ec4131f 100644
--- a/src17/access/pg_tdeam.c
+++ b/src17/access/pg_tdeam.c
@@ -2961,8 +2961,6 @@ l1:
 
 	old_key_tuple = ExtractReplicaIdentity(relation, decrypted_tuple, true, &old_key_copied);
 
-	tdeheap_freetuple(decrypted_tuple);
-
 	/*
 	 * If this is the first possibly-multixact-able operation in the current
 	 * transaction, set my per-backend OldestMemberMXactId setting. We can be
@@ -3100,7 +3098,15 @@ l1:
 		Assert(!HeapTupleHasExternal(&tp));
 	}
 	else if (HeapTupleHasExternal(&tp))
-		tdeheap_toast_delete(relation, &tp, false);
+	{
+		/* 
+		 * tdeheap_toast_delete needs decypted tuple to extract external 
+		 * attributes 
+		 */
+		tdeheap_toast_delete(relation, decrypted_tuple, false);
+	}
+
+	tdeheap_freetuple(decrypted_tuple);
 
 	/*
 	 * Mark tuple for invalidation from system caches at next command