diff --git a/src/flextype/core/Parsers/Shortcodes/FilesystemShortcode.php b/src/flextype/core/Parsers/Shortcodes/FilesystemShortcode.php
index b632696e..44b0be02 100644
--- a/src/flextype/core/Parsers/Shortcodes/FilesystemShortcode.php
+++ b/src/flextype/core/Parsers/Shortcodes/FilesystemShortcode.php
@@ -20,6 +20,9 @@ use Thunder\Shortcode\Shortcode\ShortcodeInterface;
 
 // Shortcode: [filesystem]
 parsers()->shortcodes()->addHandler('filesystem', static function (ShortcodeInterface $s) {
+    if (! registry()->get('flextype.settings.parsers.shortcodes.shortcodes.filesystem.enabled')) {
+        return '';
+    }
 
     $varsDelimeter = $s->getParameter('varsDelimeter') ?: '|';