diff --git a/src/api/views/events.py b/src/api/views/events.py
index 41cd544e62ca1eb770bcf8babe93d71f1b39a43f..74a2d7f12be390ce593ce533ec2d1232201afc2c 100644
--- a/src/api/views/events.py
+++ b/src/api/views/events.py
@@ -1,6 +1,6 @@
-from rest_framework import generics
-
 from core.models.events import Event
+from django.shortcuts import get_object_or_404
+from rest_framework import generics
 
 from ..serializers import EventSerializer
 from .mixins import ConferenceSlugMixin
@@ -10,12 +10,14 @@ class EventList(ConferenceSlugMixin, generics.ListAPIView):
     serializer_class = EventSerializer
 
     def get_queryset(self, **kwargs):
-        return Event.objects.filter(conference=self.conference).order_by('name')
+        return Event.objects.filter(conference=self.conference).order_by("name")
 
 
 class EventDetail(ConferenceSlugMixin, generics.RetrieveAPIView):
     serializer_class = EventSerializer
 
     def get_object(self, **kwargs):
-        event_id = self.request.resolver_match.kwargs['pk']
-        return Event.objects.conference_accessible(conference=self.conference).get(pk=event_id)
+        event_id = self.request.resolver_match.kwargs["pk"]
+        return get_object_or_404(
+            Event.objects.conference_accessible(conference=self.conference), pk=event_id
+        )