diff --git a/client/src/app/+my-library/my-video-playlists/my-video-playlist-edit.component.html b/client/src/app/+my-library/my-video-playlists/my-video-playlist-edit.component.html
index e9e4cd36c..0918a3342 100644
--- a/client/src/app/+my-library/my-video-playlists/my-video-playlist-edit.component.html
+++ b/client/src/app/+my-library/my-video-playlists/my-video-playlist-edit.component.html
@@ -14,7 +14,9 @@
             <li class="breadcrumb-item active" i18n>Edit</li>
 
             <li class="breadcrumb-item active" aria-current="page">
-              <a *ngIf="videoPlaylistToUpdate" [routerLink]="[ '/my-library/video-playlists/update', videoPlaylistToUpdate?.uuid ]">{{ videoPlaylistToUpdate?.displayName }}</a>
+              <a *ngIf="videoPlaylistToUpdate" [routerLink]="[ '/my-library/video-playlists/update', videoPlaylistToUpdate?.shortUUID]">
+                {{ videoPlaylistToUpdate?.displayName }}
+              </a>
             </li>
           }
         </ol>
diff --git a/client/src/app/+my-library/my-video-playlists/my-video-playlist-elements.component.ts b/client/src/app/+my-library/my-video-playlists/my-video-playlist-elements.component.ts
index c7ea2f5ba..27b5158d3 100644
--- a/client/src/app/+my-library/my-video-playlists/my-video-playlist-elements.component.ts
+++ b/client/src/app/+my-library/my-video-playlists/my-video-playlist-elements.component.ts
@@ -67,7 +67,7 @@ export class MyVideoPlaylistElementsComponent implements OnInit, OnDestroy {
         {
           label: $localize`Update playlist`,
           iconName: 'edit',
-          linkBuilder: playlist => [ '/my-library', 'video-playlists', 'update', playlist.uuid ]
+          linkBuilder: playlist => [ '/my-library', 'video-playlists', 'update', playlist.shortUUID ]
         },
         {
           label: $localize`Delete playlist`,
diff --git a/client/src/app/+my-library/my-video-playlists/my-video-playlists.component.html b/client/src/app/+my-library/my-video-playlists/my-video-playlists.component.html
index 5b6b7bf48..79b90807b 100644
--- a/client/src/app/+my-library/my-video-playlists/my-video-playlists.component.html
+++ b/client/src/app/+my-library/my-video-playlists/my-video-playlists.component.html
@@ -25,7 +25,7 @@
     <div *ngIf="isRegularPlaylist(playlist)" class="video-playlist-buttons">
       <my-delete-button label (click)="deleteVideoPlaylist(playlist)"></my-delete-button>
 
-      <my-edit-button label [ptRouterLink]="[ 'update', playlist.uuid ]"></my-edit-button>
+      <my-edit-button label [ptRouterLink]="[ 'update', playlist.shortUUID ]"></my-edit-button>
     </div>
   </div>
 </div>
diff --git a/client/src/app/+my-library/my-videos/my-videos.component.html b/client/src/app/+my-library/my-videos/my-videos.component.html
index 120f08d11..aeeec22b1 100644
--- a/client/src/app/+my-library/my-videos/my-videos.component.html
+++ b/client/src/app/+my-library/my-videos/my-videos.component.html
@@ -54,7 +54,7 @@
 
   <ng-template ptTemplate="rowButtons" let-video>
     <div class="action-button">
-      <my-edit-button label [ptRouterLink]="[ '/videos', 'update', video.uuid ]"></my-edit-button>
+      <my-edit-button label [ptRouterLink]="[ '/videos', 'update', video.shortUUID ]"></my-edit-button>
 
       <my-video-actions-dropdown
         [video]="video" [displayOptions]="videoDropdownDisplayOptions" [moreActions]="moreVideoActions"
diff --git a/client/src/app/shared/shared-main/video/video.model.ts b/client/src/app/shared/shared-main/video/video.model.ts
index 99ea394ca..730f51f8e 100644
--- a/client/src/app/shared/shared-main/video/video.model.ts
+++ b/client/src/app/shared/shared-main/video/video.model.ts
@@ -115,8 +115,8 @@ export class Video implements VideoServerModel {
     return buildVideoWatchPath({ shortUUID: video.shortUUID || video.uuid })
   }
 
-  static buildUpdateUrl (video: Pick<Video, 'uuid'>) {
-    return '/videos/update/' + video.uuid
+  static buildUpdateUrl (video: Partial<Pick<Video, 'uuid' | 'shortUUID'>>) {
+    return '/videos/update/' + (video.shortUUID || video.uuid)
   }
 
   constructor (hash: VideoServerModel, translations: { [ id: string ]: string } = {}) {
diff --git a/client/src/app/shared/shared-share-modal/video-share.component.html b/client/src/app/shared/shared-share-modal/video-share.component.html
index 9f1455561..6904c0584 100644
--- a/client/src/app/shared/shared-share-modal/video-share.component.html
+++ b/client/src/app/shared/shared-share-modal/video-share.component.html
@@ -16,7 +16,7 @@
       <div *ngIf="isPrivatePlaylist()" class="alert-private alert alert-warning">
         <div i18n>This playlist is private so you won't be able to share it with external users</div>
 
-        <a i18n class="peertube-button-link orange-button" [routerLink]="[ '/my-library/video-playlists/update', playlist.uuid ]" target="_blank" rel="noopener noreferrer">
+        <a i18n class="peertube-button-link orange-button" [routerLink]="[ '/my-library/video-playlists/update', playlist.shortUUID ]" target="_blank" rel="noopener noreferrer">
           Update playlist privacy
         </a>
       </div>
diff --git a/client/src/app/shared/shared-video-live/live-stream-information.component.html b/client/src/app/shared/shared-video-live/live-stream-information.component.html
index 72ec94ab0..5f574844f 100644
--- a/client/src/app/shared/shared-video-live/live-stream-information.component.html
+++ b/client/src/app/shared/shared-video-live/live-stream-information.component.html
@@ -55,7 +55,7 @@
 
       <my-edit-button
         i18n-label label="Update live settings"
-        [ptRouterLink]="[ '/videos', 'update', video.uuid ]" (click)="dismiss()"
+        [ptRouterLink]="[ '/videos', 'update', video.shortUUID ]" (click)="dismiss()"
       ></my-edit-button>
     </div>
   </div>
diff --git a/client/src/app/shared/shared-video-miniature/video-actions-dropdown.component.ts b/client/src/app/shared/shared-video-miniature/video-actions-dropdown.component.ts
index 186ea09e3..63e1a90cb 100644
--- a/client/src/app/shared/shared-video-miniature/video-actions-dropdown.component.ts
+++ b/client/src/app/shared/shared-video-miniature/video-actions-dropdown.component.ts
@@ -368,19 +368,19 @@ export class VideoActionsDropdownComponent implements OnChanges {
         },
         {
           label: $localize`Update`,
-          linkBuilder: ({ video }) => [ '/videos/update', video.uuid ],
+          linkBuilder: ({ video }) => [ '/videos/update', video.shortUUID ],
           iconName: 'edit',
           isDisplayed: () => this.authService.isLoggedIn() && this.displayOptions.update && this.isVideoUpdatable()
         },
         {
           label: $localize`Studio`,
-          linkBuilder: ({ video }) => [ '/studio/edit', video.uuid ],
+          linkBuilder: ({ video }) => [ '/studio/edit', video.shortUUID ],
           iconName: 'film',
           isDisplayed: () => this.authService.isLoggedIn() && this.displayOptions.studio && this.isVideoEditable()
         },
         {
           label: $localize`Stats`,
-          linkBuilder: ({ video }) => [ '/stats/videos', video.uuid ],
+          linkBuilder: ({ video }) => [ '/stats/videos', video.shortUUID ],
           iconName: 'stats',
           isDisplayed: () => this.authService.isLoggedIn() && this.displayOptions.stats && this.isVideoStatsAvailable()
         },
diff --git a/client/src/app/shared/shared-video-playlist/video-playlist-element-miniature.component.html b/client/src/app/shared/shared-video-playlist/video-playlist-element-miniature.component.html
index 6e384eea7..258710a8e 100644
--- a/client/src/app/shared/shared-video-playlist/video-playlist-element-miniature.component.html
+++ b/client/src/app/shared/shared-video-playlist/video-playlist-element-miniature.component.html
@@ -51,7 +51,7 @@
     </div>
   </a>
 
-  <my-edit-button *ngIf="owned && touchScreenEditButton" [ptRouterLink]="[ '/my-library', 'video-playlists', playlist.uuid ]"></my-edit-button>
+  <my-edit-button *ngIf="owned && touchScreenEditButton" [ptRouterLink]="[ '/my-library', 'video-playlists', playlist.shortUUID ]"></my-edit-button>
 
   <div
     *ngIf="owned" class="more dropdown-root" ngbDropdown #moreDropdown="ngbDropdown" placement="left auto"
diff --git a/client/src/app/shared/shared-video-playlist/video-playlist-miniature.component.ts b/client/src/app/shared/shared-video-playlist/video-playlist-miniature.component.ts
index 880bcb24a..d13ca4511 100644
--- a/client/src/app/shared/shared-video-playlist/video-playlist-miniature.component.ts
+++ b/client/src/app/shared/shared-video-playlist/video-playlist-miniature.component.ts
@@ -44,7 +44,7 @@ export class VideoPlaylistMiniatureComponent implements OnInit {
 
   buildPlaylistUrl () {
     if (this.toManage) {
-      this.routerLink = [ '/my-library/video-playlists', this.playlist.uuid ]
+      this.routerLink = [ '/my-library/video-playlists', this.playlist.shortUUID ]
       return
     }