diff --git a/apps/dashboard/src/routes/api/analytics/user/+server.ts b/apps/dashboard/src/routes/api/analytics/user/+server.ts
index eda9ceb2..f7635190 100644
--- a/apps/dashboard/src/routes/api/analytics/user/+server.ts
+++ b/apps/dashboard/src/routes/api/analytics/user/+server.ts
@@ -1,11 +1,12 @@
-import { getServerSupabase } from '$lib/utils/functions/supabase.server';
-import { fetchCourses, fetchProfileCourseProgress } from '$lib/utils/services/courses';
 import type {
   UserAnalytics,
   UserCourseAnalytics,
   UserExerciseStatsQuery,
   UserExercisesStats
 } from '$lib/utils/types/analytics';
+import { fetchCourses, fetchProfileCourseProgress } from '$lib/utils/services/courses';
+
+import { getServerSupabase } from '$lib/utils/functions/supabase.server';
 import { json } from '@sveltejs/kit';
 
 const supabase = getServerSupabase();
@@ -124,7 +125,7 @@ async function getAudienceData(userId: string, orgId: string): Promise<UserAnaly
   const overallAverageGrade = Math.round(allGrades / audienceAnalytics.courses.length);
 
   audienceAnalytics.overallCourseProgress = overallCourseProgress;
-  audienceAnalytics.overallAverageGrade = overallAverageGrade;
+  audienceAnalytics.overallAverageGrade = overallAverageGrade || 0;
 
   return audienceAnalytics;
 }
diff --git a/apps/dashboard/src/routes/org/[slug]/audience/[...params]/+page.svelte b/apps/dashboard/src/routes/org/[slug]/audience/[...params]/+page.svelte
index 380d52e5..a5695c4a 100644
--- a/apps/dashboard/src/routes/org/[slug]/audience/[...params]/+page.svelte
+++ b/apps/dashboard/src/routes/org/[slug]/audience/[...params]/+page.svelte
@@ -110,7 +110,7 @@
         </div>
       </Grid>
 
-      <div class="mt-5 rounded-md border p-3 dark:border-neutral-600 md:p-5">
+      <div class="mt-5 rounded-md border p-3 md:p-5 dark:border-neutral-600">
         <h3 class="text-2xl font-bold">
           {$t('analytics.courses')}
         </h3>
@@ -164,7 +164,11 @@
             >
               <div class="flex items-center justify-between gap-4">
                 <div class="flex w-4/5 items-center gap-4">
-                  <img src={course.logo} alt={course.title} class="h-20 w-24 rounded-md" />
+                  <img
+                    src={course.logo || '/images/classroomio-course-img-template.jpg'}
+                    alt={course.title}
+                    class="h-20 w-24 rounded-md"
+                  />
                   <div class="mb-4 gap-4">
                     <a href={`/courses/${course.id}`}>
                       <p class="text-lg font-semibold text-gray-600">