diff --git a/internal/processing/status/create.go b/internal/processing/status/create.go
index 737ae9af5..10a5560b6 100644
--- a/internal/processing/status/create.go
+++ b/internal/processing/status/create.go
@@ -146,14 +146,6 @@ func (p *Processor) Create(
 		}
 	}
 
-	// Only store ContentWarningText if the parsed
-	// result is different from the given SpoilerText,
-	// otherwise skip to avoid duplicating db columns.
-	var contentWarningText string
-	if content.ContentWarning != form.SpoilerText {
-		contentWarningText = form.SpoilerText
-	}
-
 	status := &gtsmodel.Status{
 		ID:                       statusID,
 		URI:                      accountURIs.StatusesURI + "/" + statusID,
@@ -171,11 +163,10 @@ func (p *Processor) Create(
 		Language: content.Language,
 
 		// Set formatted status content.
-		Content:            content.Content,
-		ContentWarning:     content.ContentWarning,
-		Text:               form.Status,        // raw
-		ContentWarningText: contentWarningText, // raw
-		ContentType:        contentType,
+		Content:        content.Content,
+		ContentWarning: content.ContentWarning,
+		Text:           form.Status, // raw
+		ContentType:    contentType,
 
 		// Set gathered mentions.
 		MentionIDs: content.MentionIDs,
@@ -198,6 +189,13 @@ func (p *Processor) Create(
 		PendingApproval: util.Ptr(false),
 	}
 
+	// Only store ContentWarningText if the parsed
+	// result is different from the given SpoilerText,
+	// otherwise skip to avoid duplicating db columns.
+	if content.ContentWarning != form.SpoilerText {
+		status.ContentWarningText = form.SpoilerText
+	}
+
 	if backfill {
 		// Ensure backfilled status contains no
 		// mentions to anyone other than author.
diff --git a/internal/processing/status/edit.go b/internal/processing/status/edit.go
index 661c12d5f..a9323a72c 100644
--- a/internal/processing/status/edit.go
+++ b/internal/processing/status/edit.go
@@ -312,11 +312,9 @@ func (p *Processor) Edit(
 	// Only store ContentWarningText if the parsed
 	// result is different from the given SpoilerText,
 	// otherwise skip to avoid duplicating db columns.
-	var contentWarningText string
 	if content.ContentWarning != form.SpoilerText {
-		contentWarningText = form.SpoilerText
+		status.ContentWarningText = form.SpoilerText
 	}
-	status.ContentWarningText = contentWarningText // raw
 
 	if poll != nil {
 		// Set relevent fields for latest with poll.