diff --git a/h5p.classes.php b/h5p.classes.php
index e3dc773..8112a5c 100644
--- a/h5p.classes.php
+++ b/h5p.classes.php
@@ -2907,6 +2907,15 @@ class H5PCore {
         );
       }
     }
+
+    // Restrict LRS dependent content
+    if (!$this->h5pF->getOption('enable_lrs_content_types')) {
+      foreach ($cached_libraries as &$lib) {
+        if ($lib['machineName'] === 'H5P.Questionnaire') {
+          $lib['restricted'] = TRUE;
+        }
+      }
+    }
   }
 
   /**