diff --git a/client/src/app/videos/+video-watch/comment/video-comment.component.scss b/client/src/app/videos/+video-watch/comment/video-comment.component.scss
index 3e8892e84..d948c9670 100644
--- a/client/src/app/videos/+video-watch/comment/video-comment.component.scss
+++ b/client/src/app/videos/+video-watch/comment/video-comment.component.scss
@@ -44,6 +44,8 @@
     }
 
     .comment-html {
+      word-break: break-all;
+
       a {
         @include disable-default-a-behaviour;
 
diff --git a/client/src/app/videos/+video-watch/video-watch.component.scss b/client/src/app/videos/+video-watch/video-watch.component.scss
index c88596196..bc737ccd5 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.scss
+++ b/client/src/app/videos/+video-watch/video-watch.component.scss
@@ -196,6 +196,10 @@
       margin: 20px 0;
       font-size: 15px;
 
+      .video-info-description-html {
+        word-break: break-all;
+      }
+
       .description-loading {
         display: inline-block;
       }