diff --git a/app/Jobs/LikePipeline/LikePipeline.php b/app/Jobs/LikePipeline/LikePipeline.php
index ce70790ca..d2be251ac 100644
--- a/app/Jobs/LikePipeline/LikePipeline.php
+++ b/app/Jobs/LikePipeline/LikePipeline.php
@@ -2,7 +2,7 @@
 
 namespace App\Jobs\LikePipeline;
 
-use Cache, Log;
+use Cache, DB, Log;
 use Illuminate\Support\Facades\Redis;
 use App\{Like, Notification};
 use Illuminate\Bus\Queueable;
@@ -59,6 +59,9 @@ class LikePipeline implements ShouldQueue
             return;
         }
 
+        $status->likes_count = DB::table('likes')->whereStatusId($status->id)->count();
+        $status->save();
+
         StatusService::refresh($status->id);
 
         if($status->url && $actor->domain == null) {
diff --git a/app/Jobs/LikePipeline/UnlikePipeline.php b/app/Jobs/LikePipeline/UnlikePipeline.php
index 0e3ff4785..267332974 100644
--- a/app/Jobs/LikePipeline/UnlikePipeline.php
+++ b/app/Jobs/LikePipeline/UnlikePipeline.php
@@ -2,7 +2,7 @@
 
 namespace App\Jobs\LikePipeline;
 
-use Cache, Log;
+use Cache, DB, Log;
 use Illuminate\Support\Facades\Redis;
 use App\{Like, Notification};
 use Illuminate\Bus\Queueable;
@@ -59,9 +59,8 @@ class UnlikePipeline implements ShouldQueue
 			return;
 		}
 
-		$count = $status->likes_count > 1 ? $status->likes_count : $status->likes()->count();
-		$status->likes_count = $count - 1;
-		$status->save();
+		$status->likes_count = DB::table('likes')->whereStatusId($status->id)->count();
+        $status->save();
 
 		StatusService::refresh($status->id);