diff --git a/CHANGELOG.md b/CHANGELOG.md
index ba05f0c..5218fc0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@ Note: Breaking changes between versions are indicated by "💥".
 
 ## Unreleased
 
+- 💥[Improvement] Enable unit completion tracking by default.
 - [Bugfix] Run `apt update` before `apt install` when installing deps in the openedx Dockerfile
 
 ## v10.3.1 (2020-10-16)
diff --git a/tutor/templates/hooks/lms/init b/tutor/templates/hooks/lms/init
index f7db997..0eb9270 100644
--- a/tutor/templates/hooks/lms/init
+++ b/tutor/templates/hooks/lms/init
@@ -24,4 +24,8 @@ if [ -d /openedx/data/uploads/ ]; then
     mv /openedx/data/uploads/* /openedx/media/
     rm -rf /openedx/data/uploads/
   fi
-fi
\ No newline at end of file
+fi
+
+# Create waffle switches to enable some features, if they have not been explicitely defined before
+# Completion tracking: add green ticks to every completed unit
+(./manage.py lms waffle_switch --list | grep completion.enable_completion_tracking) || ./manage.py lms waffle_switch --create completion.enable_completion_tracking on