diff --git a/lectures/templates/lectures/view_lecture.html b/lectures/templates/lectures/view_lecture.html
index 932a2f01509cd357b34fac9988c738ef0593a295..28217eb76ea1777b84f14c8f7ffe7ac9d65ab705 100644
--- a/lectures/templates/lectures/view_lecture.html
+++ b/lectures/templates/lectures/view_lecture.html
@@ -44,13 +44,15 @@
         {% endif %}
     </div>
 
-    <script>
-        window.isRegistered = {% if user|is_registered:lecture %}
-            true
-        {% else %}
-            false
-        {% endif %};
-    </script>
+    {% if user.is_authenticated %}
+        <script>
+            window.isRegistered = {% if user|is_registered:lecture %}
+                true
+            {% else %}
+                false
+            {% endif %};
+        </script>
+    {% endif %}
 
     <div class="flex flex-col gap-2 my-4 py-4 border-y border-gray-200">
         <div class="flex justify-between gap-2 text-lg text-gray-600">
diff --git a/lectures/views.py b/lectures/views.py
index 2d3a2e2a9444330d4d743ac51edda38d5ed355e8..1b579d4d4031f854fb566cbe0ae1e1f31e5546b0 100644
--- a/lectures/views.py
+++ b/lectures/views.py
@@ -79,7 +79,10 @@ def get_lectures(request, filter=None, get_exceptions: bool = True) -> tuple:
                 )
             )
             & (
-                models.Q(user_groups__in=request.user.groups.all())
+                (
+                    models.Q(user_groups__in=request.user.groups.all())
+                    | models.Q(user_groups=None)
+                )
                 if not request.user.is_superuser
                 else models.Q(id__isnull=False)  # Always True
             )
@@ -136,7 +139,10 @@ def view_group_lectures(request, group_id: int):
     group_id_exists = group.exists()
 
     if not request.user.is_superuser:
-        group = group.filter(models.Q(user_groups__in=request.user.groups.all()))
+        group = group.filter(
+            models.Q(user_groups__in=request.user.groups.all())
+            | models.Q(user_groups=None)
+        )
 
     if not group.exists():
         if not group_id_exists:  # Doesn't exist at all