diff --git a/src/common/config/public/ClientConfig.ts b/src/common/config/public/ClientConfig.ts
index facc64f6..723a097a 100644
--- a/src/common/config/public/ClientConfig.ts
+++ b/src/common/config/public/ClientConfig.ts
@@ -57,8 +57,8 @@ export class ClientSharingConfig {
 
 @SubConfigClass()
 export class ClientRandomPhotoConfig {
-  @ConfigProperty()
-  enabled: boolean = true;
+  @ConfigProperty({description: 'Enables random link generation. NOTE: With the current implementation, it poses a security risk. See https://github.com/bpatrik/pigallery2/issues/392'})
+  enabled: boolean = false;
 }
 
 @SubConfigClass()
diff --git a/src/frontend/app/ui/settings/random-photo/random-photo.settings.component.html b/src/frontend/app/ui/settings/random-photo/random-photo.settings.component.html
index 3843cc1d..e137c09d 100644
--- a/src/frontend/app/ui/settings/random-photo/random-photo.settings.component.html
+++ b/src/frontend/app/ui/settings/random-photo/random-photo.settings.component.html
@@ -25,10 +25,17 @@
 
       <ng-container *ngIf="states.enabled.value  || settingsService.isSupported()">
 
-        <div class="alert alert-secondary" role="alert" i18n>
-          This feature enables you to generate 'random photo' urls.
-          That URL returns a photo random selected from your gallery.
-          You can use the url with 3rd party application like random changing desktop background.
+        <div class="alert alert-secondary" role="alert">
+          <ng-container i18n>
+            This feature enables you to generate 'random photo' urls.
+            That URL returns a photo random selected from your gallery.
+            You can use the url with 3rd party application like random changing desktop background.
+          </ng-container>
+          <br/>
+          <ng-container i18n>
+            Note: With the current implementation, it poses a security risk. See:
+          </ng-container>
+          <a href="https://github.com/bpatrik/pigallery2/issues/392">#392</a>
         </div>
 
       </ng-container>