diff --git a/client/src/root-helpers/video.ts b/client/src/root-helpers/video.ts
index 2999f0e40..bc06aed2b 100644
--- a/client/src/root-helpers/video.ts
+++ b/client/src/root-helpers/video.ts
@@ -14,8 +14,8 @@ export function buildVideoOrPlaylistEmbed (options: {
   iframe.width = responsive ? '100%' : '560'
   iframe.height = responsive ? '100%' : '315'
   iframe.src = embedUrl
-  iframe.frameBorder = '0'
-  iframe.allowFullscreen = true
+  iframe.style.border = 'none'
+  iframe.allow = 'fullscreen'
   iframe.sandbox.add('allow-same-origin', 'allow-scripts', 'allow-popups', 'allow-forms')
 
   if (responsive) {
diff --git a/packages/tests/src/api/server/services.ts b/packages/tests/src/api/server/services.ts
index c6074f25c..0e47cc9e9 100644
--- a/packages/tests/src/api/server/services.ts
+++ b/packages/tests/src/api/server/services.ts
@@ -80,7 +80,7 @@ describe('Test services', function () {
         const res = await server.services.getOEmbed({ oembedUrl })
         const expectedHtml = '<iframe width="560" height="315" sandbox="allow-same-origin allow-scripts allow-popups allow-forms" ' +
           `title="${video.name}" src="http://${server.host}/videos/embed/${video.shortUUID}${suffix.output}" ` +
-          'frameborder="0" allowfullscreen></iframe>'
+          'style="border:none" allow="fullscreen"></iframe>'
 
         const expectedThumbnailUrl = 'http://' + server.host + video.previewPath
 
@@ -104,7 +104,7 @@ describe('Test services', function () {
         const res = await server.services.getOEmbed({ oembedUrl })
         const expectedHtml = '<iframe width="560" height="315" sandbox="allow-same-origin allow-scripts allow-popups allow-forms" ' +
           `title="${playlistDisplayName}" src="http://${server.host}/video-playlists/embed/${playlistShortUUID}${suffix.output}" ` +
-          'frameborder="0" allowfullscreen></iframe>'
+          'style="border:none" allow="fullscreen"></iframe>'
 
         expect(res.body.html).to.equal(expectedHtml)
         expect(res.body.title).to.equal('The Life and Times of Scrooge McDuck')
@@ -125,7 +125,7 @@ describe('Test services', function () {
 
     const expectedHtml = '<iframe width="560" height="315" sandbox="allow-same-origin allow-scripts allow-popups allow-forms" ' +
       `title="${video.name}" src="http://${server.host}/videos/embed/${video.shortUUID}${query}" ` +
-      'frameborder="0" allowfullscreen></iframe>'
+      'style="border:none" allow="fullscreen"></iframe>'
 
     expect(res.body.html).to.equal(expectedHtml)
   })
@@ -140,7 +140,7 @@ describe('Test services', function () {
       const res = await server.services.getOEmbed({ oembedUrl, format, maxHeight, maxWidth })
       const expectedHtml = '<iframe width="50" height="50" sandbox="allow-same-origin allow-scripts allow-popups allow-forms" ' +
         `title="${video.name}" src="http://${server.host}/videos/embed/${video.shortUUID}" ` +
-        'frameborder="0" allowfullscreen></iframe>'
+        'style="border:none" allow="fullscreen"></iframe>'
 
       expect(res.body.html).to.equal(expectedHtml)
       expect(res.body.title).to.equal(video.name)
diff --git a/server/core/controllers/services.ts b/server/core/controllers/services.ts
index a5a457b0d..a1b4c7ffb 100644
--- a/server/core/controllers/services.ts
+++ b/server/core/controllers/services.ts
@@ -137,7 +137,7 @@ function buildOEmbed (options: {
   }
 
   const html = `<iframe width="${embedWidth}" height="${embedHeight}" sandbox="allow-same-origin allow-scripts allow-popups allow-forms" ` +
-    `title="${embedTitle}" src="${embedUrl}" frameborder="0" allowfullscreen></iframe>`
+    `title="${embedTitle}" src="${embedUrl}" style="border:none" allow="fullscreen"></iframe>`
 
   const json: any = {
     type: 'video',