diff --git a/app/Http/Controllers/ComposeController.php b/app/Http/Controllers/ComposeController.php
index 16192682c..7a3614f3d 100644
--- a/app/Http/Controllers/ComposeController.php
+++ b/app/Http/Controllers/ComposeController.php
@@ -673,7 +673,7 @@ class ComposeController extends Controller
 
 		$status->caption = strip_tags($request->caption);
 		$status->profile_id = $profile->id;
-		$entities = Extractor::create()->extract($status->caption);
+		$entities = [];
 		$visibility = $profile->unlisted == true && $visibility == 'public' ? 'unlisted' : $visibility;
 		$cw = $profile->cw == true ? true : $cw;
 		$status->is_nsfw = $cw;
diff --git a/app/Jobs/StatusPipeline/StatusEntityLexer.php b/app/Jobs/StatusPipeline/StatusEntityLexer.php
index 1ee57c559..d205f1e21 100644
--- a/app/Jobs/StatusPipeline/StatusEntityLexer.php
+++ b/app/Jobs/StatusPipeline/StatusEntityLexer.php
@@ -89,7 +89,6 @@ class StatusEntityLexer implements ShouldQueue
 		DB::transaction(function () {
 			$status = $this->status;
 			$status->rendered = nl2br($this->autolink);
-			$status->entities = json_encode($this->entities);
 			$status->save();
 		});
 	}
diff --git a/database/migrations/2023_05_13_045228_remove_unused_columns_from_notifications_table.php b/database/migrations/2023_05_13_045228_remove_unused_columns_from_notifications_table.php
new file mode 100644
index 000000000..1c450f920
--- /dev/null
+++ b/database/migrations/2023_05_13_045228_remove_unused_columns_from_notifications_table.php
@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('notifications', function (Blueprint $table) {
+        	if(Schema::hasColumn('notifications', 'message')) {
+            	$table->dropColumn('message');
+        	}
+
+        	if(Schema::hasColumn('notifications', 'rendered')) {
+            	$table->dropColumn('rendered');
+        	}
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+    }
+};