diff --git a/src/main/webapp/app/overview/course-faq/course-faq.component.html b/src/main/webapp/app/overview/course-faq/course-faq.component.html
index 115efb80cc1c..57e8599419e6 100644
--- a/src/main/webapp/app/overview/course-faq/course-faq.component.html
+++ b/src/main/webapp/app/overview/course-faq/course-faq.component.html
@@ -27,9 +27,15 @@
         </div>
     </div>
     <hr class="" />
+    @if (faqs.length === 0) {
+        <h2 class="markdown-preview" jhiTranslate="artemisApp.faq.noExisting"></h2>
+    }
     <div>
         @for (faq of this.filteredFaqs; track faq) {
             <jhi-course-faq-accordion [faq]="faq"></jhi-course-faq-accordion>
         }
     </div>
+    @if (filteredFaqs.length === 0 && faqs.length > 0) {
+        <h2 class="markdown-preview" jhiTranslate="artemisApp.faq.noMatching"></h2>
+    }
 </div>
diff --git a/src/main/webapp/app/overview/course-faq/course-faq.component.ts b/src/main/webapp/app/overview/course-faq/course-faq.component.ts
index 03fd207fda21..db5a91e2c3d7 100644
--- a/src/main/webapp/app/overview/course-faq/course-faq.component.ts
+++ b/src/main/webapp/app/overview/course-faq/course-faq.component.ts
@@ -16,6 +16,7 @@ import { loadCourseFaqCategories } from 'app/faq/faq.utils';
 import { CustomExerciseCategoryBadgeComponent } from 'app/shared/exercise-categories/custom-exercise-category-badge/custom-exercise-category-badge.component';
 import { onError } from 'app/shared/util/global.utils';
 import { SearchFilterComponent } from 'app/shared/search-filter/search-filter.component';
+import { ArtemisMarkdownModule } from 'app/shared/markdown.module';
 
 @Component({
     selector: 'jhi-course-faq',
@@ -23,7 +24,7 @@ import { SearchFilterComponent } from 'app/shared/search-filter/search-filter.co
     styleUrls: ['../course-overview.scss', 'course-faq.component.scss'],
     encapsulation: ViewEncapsulation.None,
     standalone: true,
-    imports: [ArtemisSharedComponentModule, ArtemisSharedModule, CourseFaqAccordionComponent, CustomExerciseCategoryBadgeComponent, SearchFilterComponent],
+    imports: [ArtemisSharedComponentModule, ArtemisSharedModule, CourseFaqAccordionComponent, CustomExerciseCategoryBadgeComponent, SearchFilterComponent, ArtemisMarkdownModule],
 })
 export class CourseFaqComponent implements OnInit, OnDestroy {
     private ngUnsubscribe = new Subject<void>();
diff --git a/src/main/webapp/i18n/de/faq.json b/src/main/webapp/i18n/de/faq.json
index 0cb07d298310..987b093de2c7 100644
--- a/src/main/webapp/i18n/de/faq.json
+++ b/src/main/webapp/i18n/de/faq.json
@@ -20,7 +20,9 @@
                 "questionAnswer": "Antwort auf die Frage",
                 "categories": "Kategorien"
             },
-            "course": "Kurs"
+            "course": "Kurs",
+            "noExisting": "Momentan existiert für diesen Kurs noch kein FAQ.",
+            "noMatching": "Es gibt kein FAQ, das die Kombination aus Filter- und Suchkriterien erfüllt."
         }
     }
 }
diff --git a/src/main/webapp/i18n/en/faq.json b/src/main/webapp/i18n/en/faq.json
index 1a158eb52c40..3fd403409d2b 100644
--- a/src/main/webapp/i18n/en/faq.json
+++ b/src/main/webapp/i18n/en/faq.json
@@ -20,7 +20,9 @@
                 "questionAnswer": "Question answer",
                 "categories": "Categories"
             },
-            "course": "Course"
+            "course": "Course",
+            "noExisting": "Currently, there is no FAQ available for this course.",
+            "noMatching": "There is no FAQ that matches the combination of filter and search criteria."
         }
     }
 }