diff --git a/site/plugins/admin/app/Controllers/SettingsController.php b/site/plugins/admin/app/Controllers/SettingsController.php
index 7a4105b8..f4da14ba 100644
--- a/site/plugins/admin/app/Controllers/SettingsController.php
+++ b/site/plugins/admin/app/Controllers/SettingsController.php
@@ -136,6 +136,7 @@ class SettingsController extends Controller
         Arr::set($data, 'slugify.lowercase', ($data['slugify']['lowercase'] === '1'));
         Arr::set($data, 'cache.lifetime', (int) $data['cache']['lifetime']);
         Arr::set($data, 'twig.extensions', explode(',', $data['twig']['extensions']));
+        Arr::set($data, 'shortcodes.extensions', explode(',', $data['shortcodes']['extensions']));
         Arr::set($data, 'entries.media.upload_images_quality', (int) $data['entries']['media']['upload_images_quality']);
         Arr::set($data, 'entries.media.upload_images_width', (int) $data['entries']['media']['upload_images_width']);
         Arr::set($data, 'entries.media.upload_images_height', (int) $data['entries']['media']['upload_images_height']);
diff --git a/site/plugins/admin/lang/en_US.yaml b/site/plugins/admin/lang/en_US.yaml
index c59c3b26..1dd958e9 100755
--- a/site/plugins/admin/lang/en_US.yaml
+++ b/site/plugins/admin/lang/en_US.yaml
@@ -321,8 +321,10 @@ admin_help_text_for_api_calls_limit_label: "Limits for API Calls. Leave 0 for un
 admin_error_api_calls_empty_input: "API Calls limit has to be an numeric value."
 admin_help_text_for_api_token_icon: "API Token valid :link icon class."
 admin_state: "State"
-admin_help_text_for_settings_twig_extensions_label: "Twig Extension to load."
+admin_help_text_for_settings_twig_extensions_label: "Twig Extensions to load."
 admin_twig_extensions: "Twig extensions"
+admin_help_text_for_settings_shortcodes_extensions_label: "Shortcodes Extensions to load."
+admin_shortcodes_extensions: "Shortcodes extensions"
 admin_message_delivery_api_token_updated: "Delivery token updated."
 admin_message_delivery_api_token_was_not_updated: "Delivery token was not updated."
 admin_message_delivery_api_token_created: "Delivery token created."
diff --git a/site/plugins/admin/templates/system/settings/index.html b/site/plugins/admin/templates/system/settings/index.html
index a185cee8..d4c02812 100644
--- a/site/plugins/admin/templates/system/settings/index.html
+++ b/site/plugins/admin/templates/system/settings/index.html
@@ -80,6 +80,11 @@
                             <input type="text" id="systemSettingsSystemCharset" name="charset" value="{{ registry.settings.charset }}" class="form-control" required="required">
                             <small class="form-text text-muted">{{ tr('admin_help_text_for_settings_content_character_label') }}</small>
                         </div>
+                        <div class="form-group">
+                            <label for="shortcodes[extensions]">{{ tr('admin_shortcodes_extensions') }}</label>
+                            <input id="systemSettingsShortcodesExtensions" name="shortcodes[extensions]" class="form-control" data-role="tagsinput" value="{{ registry.settings.shortcodes.extensions|join(',') }}" required="required">
+                            <small class="form-text text-muted">{{ tr('admin_help_text_for_settings_shortcodes_extensions_label') }}</small>
+                        </div>
                     </div>
                     <div class="col-md-6">
                         <div class="form-group">