diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index da3074ee02f31ac95dc7b400339d45331b39cadb..4f23945b46e038ea5acaaeb29aafdca61404f4fb 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -24,6 +24,7 @@ Fixed
 
 * The week overview page was not refreshed when a new week was selected in the dropdown.
 * Make generation of full register printout faster.
+* Updating a lesson documentation caused an error when the preference for carrying over lesson documentations to the whole week was deactivated.
 
 `2.0.1`_ - 2022-02-12
 ---------------------
diff --git a/aleksis/apps/alsijil/forms.py b/aleksis/apps/alsijil/forms.py
index e23d8c47b344e2e7aa2b7a67ce344c42e4fa205d..f9aced0507b00540890eb58fe3d3ce978fa053d1 100644
--- a/aleksis/apps/alsijil/forms.py
+++ b/aleksis/apps/alsijil/forms.py
@@ -58,7 +58,8 @@ class LessonDocumentationForm(forms.ModelForm):
     def save(self, **kwargs):
         lesson_documentation = super(LessonDocumentationForm, self).save(commit=True)
         if (
-            self.cleaned_data["carry_over_week"]
+            get_site_preferences()["alsijil__allow_carry_over_same_week"]
+            and self.cleaned_data["carry_over_week"]
             and (
                 lesson_documentation.topic
                 or lesson_documentation.homework