diff --git a/app/Endpoint/Api/Http/Controllers/MessageController.php b/app/Endpoint/Api/Http/Controllers/MessageController.php
index a871ad8a..5ba48d1d 100644
--- a/app/Endpoint/Api/Http/Controllers/MessageController.php
+++ b/app/Endpoint/Api/Http/Controllers/MessageController.php
@@ -51,7 +51,7 @@ class MessageController extends Controller
      */
     public function batchRead(Request $request)
     {
-        $ids = Message::with('logs')->where('user_id', 0)->whereDoesntHave('logs', function ($q) use ($request) {
+        $ids = Message::userMessages($request->user())->with('logs')->where('user_id', 0)->whereDoesntHave('logs', function ($q) use ($request) {
             return $q->where('user_id', '=', $request->user()->id);
         })->pluck('id')->toArray();
 
diff --git a/app/Models/Message.php b/app/Models/Message.php
index a5d6782b..a35be9c9 100644
--- a/app/Models/Message.php
+++ b/app/Models/Message.php
@@ -46,7 +46,7 @@ class Message extends Model
 
     public static function userMessages(User $user)
     {
-        return self::where(function ($q) use ($user) {
+        return self::where('created_at', '>=', $user->created_at->subDays(7))->where(function ($q) use ($user) {
             $q->where('user_id', $user->id)->orWhere('user_id', 0);
         });
     }