diff --git a/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.ts b/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.ts
index e46ce6599..5a18cd78a 100644
--- a/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.ts
+++ b/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.ts
@@ -221,11 +221,12 @@ export class VideoUploadComponent extends VideoSend implements OnInit, OnDestroy
   isPublishingButtonDisabled () {
     return !this.form.valid ||
       this.isUpdatingVideo === true ||
-      this.videoUploaded !== true
+      this.videoUploaded !== true ||
+      !this.videoUploadedIds.id
   }
 
   updateSecondStep () {
-    if (this.checkForm() === false) {
+    if (this.isPublishingButtonDisabled() || !this.checkForm()) {
       return
     }