diff --git a/app/Http/Controllers/Api/BaseApiController.php b/app/Http/Controllers/Api/BaseApiController.php
index ee58ada6b..4d22dd7b3 100644
--- a/app/Http/Controllers/Api/BaseApiController.php
+++ b/app/Http/Controllers/Api/BaseApiController.php
@@ -259,27 +259,27 @@ class BaseApiController extends Controller
 
     public function accountLikes(Request $request)
     {
-        $user = $request->user();
         abort_if(!$request->user(), 403);
+        $this->validate($request, [
+        	'page' => 'sometimes|int|min:1|max:40',
+        	'limit' => 'sometimes|int|min:1|max:10'
+        ]);
 
-        $limit = 10;
-        $page = (int) $request->input('page', 1);
+        $user = $request->user();
+        $limit = $request->input('limit', 10);
 
-        if($page > 20) {
-            return [];
-        }
-
-        $favourites = $user->profile->likes()
-        ->latest()
-        ->simplePaginate($limit)
-        ->pluck('status_id');
-
-        $statuses = Status::find($favourites)->reverse();
-
-        $resource = new Fractal\Resource\Collection($statuses, new StatusStatelessTransformer());
-        $res = $this->fractal->createData($resource)->toArray();
-
-        return response()->json($res, 200, [], JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES);
+        $res = \DB::table('likes')
+        	->whereProfileId($user->profile_id)
+        	->latest()
+        	->simplePaginate($limit)
+        	->map(function($id) {
+        		return StatusService::get($id->status_id, false);
+        	})
+        	->filter(function($post) {
+        		return $post && isset($post['account']);
+        	})
+        	->values();
+        return response()->json($res);
     }
 
     public function archive(Request $request, $id)