diff --git a/front/app/orgs/[orgslug]/(withmenu)/courses/page.tsx b/front/app/orgs/[orgslug]/(withmenu)/courses/page.tsx
index fb3238f3..027e7719 100644
--- a/front/app/orgs/[orgslug]/(withmenu)/courses/page.tsx
+++ b/front/app/orgs/[orgslug]/(withmenu)/courses/page.tsx
@@ -1,9 +1,10 @@
 
 import React from "react";
 import Courses from "./courses";
-import { getOrgCourses } from "@services/courses/courses";
+import { getOrgCoursesWithAuthHeader } from "@services/courses/courses";
 import { Metadata } from "next";
 import { getOrganizationContextInfo } from "@services/organizations/orgs";
+import { cookies } from "next/headers";
 
 type MetadataProps = {
   params: { orgslug: string };
@@ -24,7 +25,9 @@ export async function generateMetadata(
 
 const CoursesPage = async (params: any) => {
   const orgslug = params.params.orgslug;
-  const courses = await getOrgCourses(orgslug, { revalidate: 0, tags: ['courses'] });
+  const cookieStore = cookies();
+  const access_token_cookie: any = cookieStore.get('access_token_cookie');
+  const courses = await getOrgCoursesWithAuthHeader(orgslug, { revalidate: 0, tags: ['courses'] }, access_token_cookie ? access_token_cookie.value : null);
 
   return (
     <div>
diff --git a/front/services/courses/courses.ts b/front/services/courses/courses.ts
index 62e29b3f..3cf1f13c 100644
--- a/front/services/courses/courses.ts
+++ b/front/services/courses/courses.ts
@@ -9,7 +9,6 @@ import { RequestBody, RequestBodyForm, RequestBodyWithAuthHeader, errorHandling
 export async function getOrgCourses(org_id: number, next: any) {
   const result: any = await fetch(`${getAPIUrl()}courses/org_slug/${org_id}/page/1/limit/10`, RequestBody("GET", null, next));
   const res = await errorHandling(result);
-
   return res;
 }
 
diff --git a/src/routers/courses/courses.py b/src/routers/courses/courses.py
index bb6252e4..4aed4c99 100644
--- a/src/routers/courses/courses.py
+++ b/src/routers/courses/courses.py
@@ -1,7 +1,7 @@
 from fastapi import APIRouter, Depends, UploadFile, Form, Request
 from src.security.auth import get_current_user
 
-from src.services.courses.courses import Course,  create_course,  get_course, get_course_meta, get_courses, get_courses_orgslug, update_course, delete_course, update_course_thumbnail
+from src.services.courses.courses import Course,  create_course,  get_course, get_course_meta, get_courses_orgslug, update_course, delete_course, update_course_thumbnail
 from src.services.users.users import PublicUser
 
 
@@ -41,21 +41,12 @@ async def api_get_course_meta(request: Request, course_id: str,  current_user: P
     """
     return await get_course_meta(request, course_id, current_user=current_user)
 
-
-@router.get("/org_id/{org_id}/page/{page}/limit/{limit}")
-async def api_get_course_by(request: Request, page: int, limit: int, org_id: str):
-    """
-    Get houses by page and limit
-    """
-    return await get_courses(request, page, limit, org_id)
-
-
 @router.get("/org_slug/{org_slug}/page/{page}/limit/{limit}")
-async def api_get_course_by_orgslug(request: Request, page: int, limit: int, org_slug: str):
+async def api_get_course_by_orgslug(request: Request, page: int, limit: int, org_slug: str, current_user: PublicUser = Depends(get_current_user)):
     """
     Get houses by page and limit
     """
-    return await get_courses_orgslug(request, page, limit, org_slug)
+    return await get_courses_orgslug(request, current_user, page, limit, org_slug)
 
 
 @router.put("/{course_id}")
diff --git a/src/services/courses/courses.py b/src/services/courses/courses.py
index a7c65022..aa79f77d 100644
--- a/src/services/courses/courses.py
+++ b/src/services/courses/courses.py
@@ -313,31 +313,15 @@ async def delete_course(request: Request, course_id: str, current_user: PublicUs
 ####################################################
 
 
-async def get_courses(
-    request: Request, page: int = 1, limit: int = 10, org_id: str | None = None
-):
-    courses = request.app.db["courses"]
-    # TODO : Get only courses that user is admin/has roles of
-    # get all courses from database
-    all_courses = (
-        courses.find({"org_id": org_id})
-        .sort("name", 1)
-        .skip(10 * (page - 1))
-        .limit(limit)
-    )
-
-    return [
-        json.loads(json.dumps(course, default=str))
-        for course in await all_courses.to_list(length=100)
-    ]
-
-
 async def get_courses_orgslug(
-    request: Request, page: int = 1, limit: int = 10, org_slug: str | None = None
+    request: Request,
+    current_user: PublicUser,
+    page: int = 1,
+    limit: int = 10,
+    org_slug: str | None = None,
 ):
     courses = request.app.db["courses"]
     orgs = request.app.db["organizations"]
-    # TODO : Get only courses that user is admin/has roles of
 
     # get org_id from slug
     org = await orgs.find_one({"slug": org_slug})
@@ -347,13 +331,21 @@ async def get_courses_orgslug(
             status_code=status.HTTP_409_CONFLICT, detail="Organization does not exist"
         )
 
-    # get all courses from database
-    all_courses = (
-        courses.find({"org_id": org["org_id"]})
-        .sort("name", 1)
-        .skip(10 * (page - 1))
-        .limit(limit)
-    )
+    # show only public courses if user is not logged in
+    if current_user.user_id == "anonymous":
+        all_courses = (
+            courses.find({"org_id": org["org_id"], "public": True})
+            .sort("name", 1)
+            .skip(10 * (page - 1))
+            .limit(limit)
+        )
+    else:
+        all_courses = (
+            courses.find({"org_id": org["org_id"]})
+            .sort("name", 1)
+            .skip(10 * (page - 1))
+            .limit(limit)
+        )
 
     return [
         json.loads(json.dumps(course, default=str))
@@ -395,7 +387,6 @@ async def verify_rights(
     hasRoleRights = await verify_user_rights_with_roles(
         request, action, current_user.user_id, course_id, course["org_id"]
     )
-    
 
     if not hasRoleRights and not isAuthor:
         raise HTTPException(