diff --git a/src/frontend/app/ui/settings/template/settings-entry/settings-entry.component.html b/src/frontend/app/ui/settings/template/settings-entry/settings-entry.component.html
index 91333888..9c306671 100644
--- a/src/frontend/app/ui/settings/template/settings-entry/settings-entry.component.html
+++ b/src/frontend/app/ui/settings/template/settings-entry/settings-entry.component.html
@@ -286,7 +286,11 @@
         </div>
       </div>
 
-      <small class="form-text text-muted" *ngIf="description">{{description}}
+      <small class="form-text text-muted" *ngIf="description">
+        <ng-container *ngIf="experimental">
+          <span class="oi oi-warning"></span>[Experimental]
+        </ng-container>
+        {{description}}
         <span *ngIf="type==='array' && (state.arrayType === 'string' || isNumberArray)" i18n>';' separated list.</span>
         <a *ngIf="state.tags?.githubIssue"
            [href]="'https://github.com/bpatrik/pigallery2/issues/'+state.tags?.githubIssue">
diff --git a/src/frontend/app/ui/settings/template/settings-entry/settings-entry.component.ts b/src/frontend/app/ui/settings/template/settings-entry/settings-entry.component.ts
index 7639144c..be5ee1a2 100644
--- a/src/frontend/app/ui/settings/template/settings-entry/settings-entry.component.ts
+++ b/src/frontend/app/ui/settings/template/settings-entry/settings-entry.component.ts
@@ -52,6 +52,7 @@ export class SettingsEntryComponent
   name: string;
   required: boolean;
   dockerWarning: boolean;
+  experimental: boolean;
   placeholder: string;
   allowSpaces = false;
   description: string;
@@ -252,6 +253,7 @@ export class SettingsEntryComponent
       this.name = this.name || this.state.tags.name;
       this.allowSpaces = this.allowSpaces || this.state.tags.uiAllowSpaces;
       this.required = this.required || !this.state.tags.uiOptional;
+      this.experimental = this.state.tags.experimental;
     }
   }