diff --git a/src/flextype/core/Parsers/Shortcodes/RegistryShortcode.php b/src/flextype/core/Parsers/Shortcodes/RegistryShortcode.php
index 91cde62e..14d34f14 100644
--- a/src/flextype/core/Parsers/Shortcodes/RegistryShortcode.php
+++ b/src/flextype/core/Parsers/Shortcodes/RegistryShortcode.php
@@ -28,7 +28,7 @@ parsers()->shortcodes()->addHandler('registry', static function (ShortcodeInterf
         return '';
     }
 
-    if ($s->getParameter('get') != null) {
+    if ($s->getParameter('get') != null && registry()->get('flextype.settings.parsers.shortcodes.shortcodes.registry.get.enabled') === true) {
 
         $value   = parsers()->shortcodes()->parse($s->getParameter('get'));
         $default = ($s->getParameter('default') != null) ? parsers()->shortcodes()->parse($s->getParameter('default')) : null;