diff --git a/server/src/controller/postController.ts b/server/src/controller/postController.ts
index 421bc06..b5293ed 100644
--- a/server/src/controller/postController.ts
+++ b/server/src/controller/postController.ts
@@ -38,7 +38,7 @@ export class PostController {
    */
   public getAllPosts = catchAsync(async (_req, res, _next) => {
     const posts = await this.postRepository.find({
-      relations: { createdBy: true },
+      relations: { createdBy: true, likedBy: true, comments: {createdBy: true} },
     });
 
         // Remove sensitive fields
diff --git a/server/src/entity/Post.ts b/server/src/entity/Post.ts
index d7e20d2..9b7eb14 100644
--- a/server/src/entity/Post.ts
+++ b/server/src/entity/Post.ts
@@ -28,10 +28,10 @@ export class Post {
 
     public deleteSensitiveFields(){
         this.createdBy.deleteSensitiveFields()
-        if(this.likedBy){
+        if(this.likedBy.length > 0){
             this.likedBy.forEach(user => user.deleteSensitiveFields())
         }
-        if(this.comments){
+        if(this.comments.length > 0){
             this.comments.forEach(comment => comment.createdBy.deleteSensitiveFields())
         }