diff --git a/lib/drawer/drawer.dart b/lib/drawer/drawer.dart
index 372b5c642c348f4e68a3717f5956dbbd72c7e8ef..d1949cf7f3579067a7d88f70d521e0dc117339ff 100644
--- a/lib/drawer/drawer.dart
+++ b/lib/drawer/drawer.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 
 import '../context.dart';
+import '../untis/class.dart';
 import 'class_list_item.dart';
 
 class ClassDrawer extends StatefulWidget {
@@ -13,6 +14,8 @@ class ClassDrawer extends StatefulWidget {
 }
 
 class _ClassDrawerState extends State<ClassDrawer> {
+  List<Class> get availableClasses => widget.appContext.classes ?? [];
+
   @override
   void initState() {
     super.initState();
@@ -30,10 +33,10 @@ class _ClassDrawerState extends State<ClassDrawer> {
     return Drawer(
       child: ListView.builder(
         itemBuilder: (context, index) {
-          final cls = widget.appContext.classes!.elementAt(index);
+          final cls = availableClasses.elementAt(index);
           return ClassListItem(cls: cls, appContext: widget.appContext);
         },
-        itemCount: widget.appContext.classes!.length,
+        itemCount: availableClasses.length,
       ),
     );
   }
diff --git a/lib/main.dart b/lib/main.dart
index c991cd2b21458ec8a50d2fb372010a0e9f05a0b4..7106dadbc334c9485319abe6645651b5f25f423e 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -123,9 +123,7 @@ class _MyHomePageState extends State<MyHomePage> {
       appBar: AppBar(
         title: const Text(appName),
       ),
-      drawer: appContext.profile.value == null
-          ? null
-          : ClassDrawer(appContext: appContext),
+      drawer: ClassDrawer(appContext: appContext),
       body: Column(
         children: [
           Toolbar(appContext: appContext),