diff --git a/api/config/settings/common.py b/api/config/settings/common.py
index 2f4f6e9a4d90e53ff041e302d29e433403b45301..800f7bf23453c6c6976b19e130f5edc773b3caf1 100644
--- a/api/config/settings/common.py
+++ b/api/config/settings/common.py
@@ -78,7 +78,7 @@ FUNKWHALE_SPA_HTML_CACHE_DURATION = env.int(
     "FUNKWHALE_SPA_HTML_CACHE_DURATION", default=60 * 15
 )
 FUNKWHALE_EMBED_URL = env(
-    "FUNKWHALE_EMBED_URL", default=FUNKWHALE_SPA_HTML_ROOT + "embed.html"
+    "FUNKWHALE_EMBED_URL", default=FUNKWHALE_URL + "/front/embed.html"
 )
 APP_NAME = "Funkwhale"
 
diff --git a/changes/changelog.d/824.bugfix b/changes/changelog.d/824.bugfix
new file mode 100644
index 0000000000000000000000000000000000000000..fa681a4e0e62fd4d00f7ac61227a1967532fe6d9
--- /dev/null
+++ b/changes/changelog.d/824.bugfix
@@ -0,0 +1 @@
+Fixed invalid OEmbed URL when using a local FUNKWHALE_SPA_HTML_ROOT (#824)