diff --git a/editor b/editor
index 4a4f69dfb3edf6548df848bb3eca0d1c4136f2d7..79adb413b81f3c6836b631c949db50e85bfa9f6d 160000
--- a/editor
+++ b/editor
@@ -1 +1 @@
-Subproject commit 4a4f69dfb3edf6548df848bb3eca0d1c4136f2d7
+Subproject commit 79adb413b81f3c6836b631c949db50e85bfa9f6d
diff --git a/lang/en/hvp.php b/lang/en/hvp.php
index 0f34e64c4a85ddf82792b5c0a8bd996ad94c4c13..6ce52c88c2ab757017cdc67e906ba6333d160c96 100644
--- a/lang/en/hvp.php
+++ b/lang/en/hvp.php
@@ -83,6 +83,8 @@ $string['enablesavecontentstate'] = 'Save content state';
 $string['enablesavecontentstate_help'] = 'Automatically save the current state of interactive content for each user. This means that the user may pick up where he left off.';
 $string['contentstatefrequency'] = 'Save content state frequency';
 $string['contentstatefrequency_help'] = 'In seconds, how often do you wish the user to auto save their progress. Increase this number if you\'re having issues with many ajax requests';
+$string['enabledlrscontenttypes'] = 'Enable LRS dependent content types';
+$string['enabledlrscontenttypes_help'] = 'Makes it possible to use content types that rely upon a Learning Record Store to function properly, like the Questionnaire content type.';
 
 // Admin menu.
 $string['settings'] = 'H5P Settings';
diff --git a/settings.php b/settings.php
index 3f92538cd4d97e6572510ed3aad3bf7f8b71731b..d4902d0f685276785c1807d65b423c8cff08a877 100644
--- a/settings.php
+++ b/settings.php
@@ -56,6 +56,12 @@ if ($ADMIN->fulltree) {
                     get_string('contentstatefrequency', 'hvp'),
                     get_string('contentstatefrequency_help', 'hvp'), 30, PARAM_INT));
 
+    // Content state.
+    $settings->add(
+            new admin_setting_configcheckbox('mod_hvp/enable_lrs_content_types',
+                    get_string('enabledlrscontenttypes', 'hvp'),
+                    get_string('enabledlrscontenttypes_help', 'hvp'), 0));
+
     // Display options for H5P frame.
     $settings->add(new admin_setting_heading('mod_hvp/display_options', get_string('displayoptions', 'hvp'), ''));
     $settings->add(new admin_setting_configcheckbox('mod_hvp/frame', get_string('enableframe', 'hvp'), '', 1));