3 files changed, 5 insertions, 6 deletions

diff --git a/client/src/app/app.component.ts b/client/src/app/app.component.ts
index 6087dbf80..0bfe9f916 100644
--- a/client/src/app/app.component.ts
+++ b/client/src/app/app.component.ts
@@ -55,7 +55,7 @@ export class AppComponent implements OnInit {
       if (e instanceof NavigationEnd) {
         const pathname = window.location.pathname
         if (!pathname || pathname === '/' || is18nPath(pathname)) {
-          this.redirectService.redirectToHomepage()
+          this.redirectService.redirectToHomepage(true)
         }
       }
     })
diff --git a/client/src/app/core/routing/redirect.service.ts b/client/src/app/core/routing/redirect.service.ts
index b7803cce2..1881be117 100644
--- a/client/src/app/core/routing/redirect.service.ts
+++ b/client/src/app/core/routing/redirect.service.ts
@@ -28,10 +28,10 @@ export class RedirectService {
         })
   }
 
-  redirectToHomepage () {
+  redirectToHomepage (skipLocationChange = false) {
     console.log('Redirecting to %s...', RedirectService.DEFAULT_ROUTE)
 
-    this.router.navigate([ RedirectService.DEFAULT_ROUTE ], { skipLocationChange: true })
+    this.router.navigate([ RedirectService.DEFAULT_ROUTE ], { skipLocationChange })
         .catch(() => {
           console.error(
             'Cannot navigate to %s, resetting default route to %s.',
@@ -40,7 +40,7 @@ export class RedirectService {
           )
 
           RedirectService.DEFAULT_ROUTE = RedirectService.INIT_DEFAULT_ROUTE
-          return this.router.navigate([ RedirectService.DEFAULT_ROUTE ], { skipLocationChange: true })
+          return this.router.navigate([ RedirectService.DEFAULT_ROUTE ], { skipLocationChange })
         })
 
   }
diff --git a/client/src/standalone/videos/embed.ts b/client/src/standalone/videos/embed.ts
index 4f6fae8aa..e28d964de 100644
--- a/client/src/standalone/videos/embed.ts
+++ b/client/src/standalone/videos/embed.ts
@@ -21,7 +21,6 @@ import * as videojs from 'video.js'
 
 import { VideoDetails } from '../../../../shared'
 import { addContextMenu, getVideojsOptions, loadLocale } from '../../assets/player/peertube-player'
-import { environment } from '../../environments/environment'
 
 function getVideoUrl (id: string) {
   return window.location.origin + '/api/v1/videos/' + id
@@ -62,7 +61,7 @@ const urlParts = window.location.href.split('/')
 const lastPart = urlParts[urlParts.length - 1]
 const videoId = lastPart.indexOf('?') === -1 ? lastPart : lastPart.split('?')[0]
 
-loadLocale(environment.apiUrl, videojs, navigator.language)
+loadLocale(window.location.origin, videojs, navigator.language)
   .then(() => loadVideoInfo(videoId))
   .then(async response => {
     const videoContainerId = 'video-container'