diff --git src/backend/access/heap/heapam.c src/backend/access/heap/heapam.c
index 57da57a..00de8ae 100644
--- src/backend/access/heap/heapam.c
+++ src/backend/access/heap/heapam.c
@@ -3335,7 +3335,7 @@ l1:
 		Assert(!HeapTupleHasExternal(&tp));
 	}
 	else if (HeapTupleHasExternal(&tp))
-		toast_delete(relation, &tp);
+		toast_delete(relation, &tp, false);
 
 	/*
 	 * Mark tuple for invalidation from system caches at next command
@@ -5894,8 +5894,15 @@ heap_finish_speculative(Relation relation, HeapTuple tuple)
 void
 heap_abort_speculative(Relation relation, HeapTuple tuple)
 {
-	TransactionId xid = GetCurrentTransactionId();
 	ItemPointer tid = &(tuple->t_self);
+
+	heap_delete_speculative(relation, tid, false);
+}
+
+void
+heap_delete_speculative(Relation relation, ItemPointer tid, bool is_toast)
+{
+	TransactionId xid = GetCurrentTransactionId();
 	ItemId		lp;
 	HeapTupleData tp;
 	Page		page;
@@ -5930,7 +5937,7 @@ heap_abort_speculative(Relation relation, HeapTuple tuple)
 	 */
 	if (tp.t_data->t_choice.t_heap.t_xmin != xid)
 		elog(ERROR, "attempted to kill a tuple inserted by another transaction");
-	if (!HeapTupleHeaderIsSpeculative(tp.t_data))
+	if (!(is_toast || HeapTupleHeaderIsSpeculative(tp.t_data)))
 		elog(ERROR, "attempted to kill a non-speculative tuple");
 	Assert(!HeapTupleHeaderIsHeapOnly(tp.t_data));
 
@@ -5999,8 +6006,8 @@ heap_abort_speculative(Relation relation, HeapTuple tuple)
 
 	LockBuffer(buffer, BUFFER_LOCK_UNLOCK);
 
-	if (HeapTupleHasExternal(&tp))
-		toast_delete(relation, &tp);
+	if (!is_toast && HeapTupleHasExternal(&tp))
+		toast_delete(relation, &tp, true);
 
 	/*
 	 * Never need to mark tuple for invalidation, since catalogs don't support
diff --git src/backend/access/heap/tuptoaster.c src/backend/access/heap/tuptoaster.c
index 4cffd21..a657330 100644
--- src/backend/access/heap/tuptoaster.c
+++ src/backend/access/heap/tuptoaster.c
@@ -66,7 +66,7 @@ typedef struct toast_compress_header
 #define TOAST_COMPRESS_SET_RAWSIZE(ptr, len) \
 	(((toast_compress_header *) (ptr))->rawsize = (len))
 
-static void toast_delete_datum(Relation rel, Datum value);
+static void toast_delete_datum(Relation rel, Datum value, bool is_speculative);
 static Datum toast_save_datum(Relation rel, Datum value,
 				 struct varlena * oldexternal, int options);
 static bool toastrel_valueid_exists(Relation toastrel, Oid valueid);
@@ -459,7 +459,7 @@ toast_datum_size(Datum value)
  * ----------
  */
 void
-toast_delete(Relation rel, HeapTuple oldtup)
+toast_delete(Relation rel, HeapTuple oldtup, bool is_speculative)
 {
 	TupleDesc	tupleDesc;
 	Form_pg_attribute *att;
@@ -506,7 +506,7 @@ toast_delete(Relation rel, HeapTuple oldtup)
 			if (toast_isnull[i])
 				continue;
 			else if (VARATT_IS_EXTERNAL_ONDISK(PointerGetDatum(value)))
-				toast_delete_datum(rel, value);
+				toast_delete_datum(rel, value, is_speculative);
 		}
 	}
 }
@@ -1062,7 +1062,7 @@ toast_insert_or_update(Relation rel, HeapTuple newtup, HeapTuple oldtup,
 	if (need_delold)
 		for (i = 0; i < numAttrs; i++)
 			if (toast_delold[i])
-				toast_delete_datum(rel, toast_oldvalues[i]);
+				toast_delete_datum(rel, toast_oldvalues[i], false);
 
 	return result_tuple;
 }
@@ -1654,7 +1654,7 @@ toast_save_datum(Relation rel, Datum value,
  * ----------
  */
 static void
-toast_delete_datum(Relation rel, Datum value)
+toast_delete_datum(Relation rel, Datum value, bool is_speculative)
 {
 	struct varlena *attr = (struct varlena *) DatumGetPointer(value);
 	struct varatt_external toast_pointer;
@@ -1703,7 +1703,10 @@ toast_delete_datum(Relation rel, Datum value)
 		/*
 		 * Have a chunk, delete it
 		 */
-		simple_heap_delete(toastrel, &toasttup->t_self);
+		if (is_speculative)
+			heap_delete_speculative(toastrel, &toasttup->t_self, true);
+		else
+			simple_heap_delete(toastrel, &toasttup->t_self);
 	}
 
 	/*
diff --git src/include/access/heapam.h src/include/access/heapam.h
index b3a595c..ca0c87d 100644
--- src/include/access/heapam.h
+++ src/include/access/heapam.h
@@ -157,6 +157,7 @@ extern HTSU_Result heap_delete(Relation relation, ItemPointer tid,
 			HeapUpdateFailureData *hufd);
 extern void heap_finish_speculative(Relation relation, HeapTuple tuple);
 extern void heap_abort_speculative(Relation relation, HeapTuple tuple);
+extern void heap_delete_speculative(Relation relation, ItemPointer tid, bool is_toast);
 extern HTSU_Result heap_update(Relation relation, ItemPointer otid,
 			HeapTuple newtup,
 			CommandId cid, Snapshot crosscheck, bool wait,
diff --git src/include/access/tuptoaster.h src/include/access/tuptoaster.h
index 7b5ae62..011f5c1 100644
--- src/include/access/tuptoaster.h
+++ src/include/access/tuptoaster.h
@@ -142,7 +142,7 @@ extern HeapTuple toast_insert_or_update(Relation rel,
  *	Called by heap_delete().
  * ----------
  */
-extern void toast_delete(Relation rel, HeapTuple oldtup);
+extern void toast_delete(Relation rel, HeapTuple oldtup, bool is_speculative);
 
 /* ----------
  * heap_tuple_fetch_attr() -
