diff --git a/apps/course/templates/course/lesson.html b/apps/course/templates/course/lesson.html
index 6c9511ae..c9f98e01 100644
--- a/apps/course/templates/course/lesson.html
+++ b/apps/course/templates/course/lesson.html
@@ -14,8 +14,8 @@
         </div>
         <div class="go__title">Вернуться к&nbsp;списку уроков</div>
       </a>
-      {% comment %} {% if next_lesson %}
-      <a class="go__item" href="{{ next_lesson }}">
+      {% if next_lesson %}
+      <a class="go__item" href="{% url 'lesson' pk=next_lesson %}">
         <div class="go__title">Перейти к&nbsp;следующему уроку</div>
         <div class="go__arrow">
           <svg class="icon icon-arrow-right">
@@ -23,7 +23,7 @@
           </svg>
         </div>
       </a>
-      {% endif %} {% endcomment %}
+      {% endif %}
     </div>
     <div class="lesson">
       <div class="lesson__subtitle subtitle">{{ lesson.title }}</div>
@@ -32,7 +32,7 @@
         {% if lesson.cover %}
         <img class="video__pic" src="{{ lesson.cover.image.url }}"/>
         {% else %}
-        
+
         {% endif %}
         <svg class="icon icon-play">
           <use xlink:href="{% static 'img/sprite.svg' %}#icon-play"></use>
diff --git a/apps/course/views.py b/apps/course/views.py
index 90957d68..60b7e308 100644
--- a/apps/course/views.py
+++ b/apps/course/views.py
@@ -299,7 +299,9 @@ class LessonView(DetailView):
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         context['next'] = self.request.GET.get('next', None)
-        context['next_lesson'] = self.request.GET.get('next_lesson', None)
+        lessons = list(self.object.course.lessons.values_list('id', flat=True))
+        index = lessons.index(self.object.id)
+        context['next_lesson'] = lessons[index + 1] if index < len(lessons) - 1 else None
         return context