diff --git a/app/Helpers/ConfigHelper.php b/app/Helpers/ConfigHelper.php
index e24c6cd..ac964b2 100644
--- a/app/Helpers/ConfigHelper.php
+++ b/app/Helpers/ConfigHelper.php
@@ -115,6 +115,7 @@ class ConfigHelper
             'items_per_page_admin' => 10,
             'moderate_anonymous_users' => true,
             'moderate_known_users' => true,
+            'photo_comments_allowed_html' => 'p,div,span,a,b,i,u',
             'photo_comments_thread_depth' => 3,
             'public_statistics' => true,
             'recaptcha_enabled_registration' => false,
diff --git a/app/Http/Controllers/Admin/DefaultController.php b/app/Http/Controllers/Admin/DefaultController.php
index fb6bcdf..60bf4b6 100644
--- a/app/Http/Controllers/Admin/DefaultController.php
+++ b/app/Http/Controllers/Admin/DefaultController.php
@@ -259,6 +259,7 @@ class DefaultController extends Controller
             'facebook_app_secret',
             'google_app_id',
             'google_app_secret',
+            'photo_comments_allowed_html',
             'photo_comments_thread_depth',
             'sender_address',
             'sender_name',
diff --git a/resources/lang/en/forms.php b/resources/lang/en/forms.php
index aef8373..f7687fd 100644
--- a/resources/lang/en/forms.php
+++ b/resources/lang/en/forms.php
@@ -55,6 +55,8 @@ return [
     'settings_allow_photo_comments_anonymous' => 'Allow anonymous users to comment on photos',
     'settings_allow_photo_comments_anonymous_help' => 'With this option enabled, users can post comments without being logged in.',
     'settings_allow_photo_comments_help' => 'With this option enabled, users can comment on individual photos.',
+    'settings_photo_comments_allowed_html' => 'HTML tags allowed in comments:',
+    'settings_photo_comments_allowed_html_help' => 'Enter a comma-separated list of HTML tags (without angle brackets) that are allowed in comments. All other tags (and their content) will be removed when a comment is posted.',
     'settings_photo_comments_thread_depth' => 'Maximum depth for nested comments:',
     'settings_photo_comments_thread_depth_help' => 'Set to zero to disable nested comments.',
     'settings_photo_comments_require_login' => 'Require login before posting comments',
diff --git a/resources/views/themes/base/admin/settings.blade.php b/resources/views/themes/base/admin/settings.blade.php
index 5698393..869241a 100644
--- a/resources/views/themes/base/admin/settings.blade.php
+++ b/resources/views/themes/base/admin/settings.blade.php
@@ -516,6 +516,12 @@
                                     @endif
                                 </div>
 
+                                <div class="form-group mt-3">
+                                    <label class="form-control-label" for="photo-comments-allowed-html">@lang('forms.settings_photo_comments_allowed_html')</label>
+                                    <textarea style="font-family: 'Lucida Console', Monaco, monospace !important;" rows="5" class="form-control{{ $errors->has('photo_comments_allowed_html') ? ' is-invalid' : '' }}" id="photo-comments-allowed-html" name="photo_comments_allowed_html">{!! old('photo_comments_allowed_html', $config['photo_comments_allowed_html']) !!}</textarea>
+                                    <small class="form-text text-muted">@lang('forms.settings_photo_comments_allowed_html_help')</small>
+                                </div>
+
                                 <hr/>
                                 <fieldset>
                                     <legend class="mb-3">