diff --git a/src/core/features/course/classes/module-base-handler.ts b/src/core/features/course/classes/module-base-handler.ts
index 6c278c502..9f1235964 100644
--- a/src/core/features/course/classes/module-base-handler.ts
+++ b/src/core/features/course/classes/module-base-handler.ts
@@ -86,7 +86,7 @@ export class CoreModuleHandlerBase implements Partial<CoreCourseModuleHandler> {
             return modicon;
         }
 
-        return CoreCourse.getModuleIconSrc(module.name, modicon);
+        return CoreCourse.getModuleIconSrc(module.modname, modicon);
     }
 
 }
diff --git a/src/core/features/course/pages/contents/contents.html b/src/core/features/course/pages/contents/contents.html
index 81b1e7dc0..ecafa525a 100644
--- a/src/core/features/course/pages/contents/contents.html
+++ b/src/core/features/course/pages/contents/contents.html
@@ -5,7 +5,7 @@
 
     <core-loading [hideUntil]="dataLoaded && !updatingData">
         <core-course-format [course]="course" [sections]="sections" [initialSectionId]="sectionId" [initialSectionNumber]="sectionNumber"
-            [moduleId]="moduleId" class="core-course-format-{{course.format}}" *ngIf="dataLoaded">
+            [moduleId]="moduleId" class="core-course-format-{{course.format}}" *ngIf="dataLoaded && sections">
         </core-course-format>
     </core-loading>
 </ion-content>