diff --git a/src/components/player.ts b/src/components/player.ts
index 459afc9..e4249c6 100644
--- a/src/components/player.ts
+++ b/src/components/player.ts
@@ -268,7 +268,7 @@ export class Player extends MaveElement {
   }
 
   play() {
-    if (this._videoElement) {
+    if (this._videoElement && !this.embedController.loading) {
       this.#requestPlay();
     } else {
       this._queue.push(() => this.#requestPlay());
diff --git a/src/embed/controller.ts b/src/embed/controller.ts
index 352f96c..1b203e1 100644
--- a/src/embed/controller.ts
+++ b/src/embed/controller.ts
@@ -18,11 +18,13 @@ export class EmbedController {
   private _token: string;
   private _version: number;
   caching: boolean = true;
+  loading: boolean = true;
 
   constructor(host: ReactiveControllerHost, embedType: EmbedType = EmbedType.Embed) {
     this.host = host;
     this.type = embedType;
 
+    this.loading = true;
     this.task = new Task(
       this.host,
       async () => {
@@ -37,6 +39,8 @@ export class EmbedController {
 
           const response = await fetch(this.manifest_url);
           const data = await response.json();
+          this.loading = false;
+
           if (this.type == EmbedType.Embed) {
             const embed = data as Partial<API.Embed>;
             this.version = embed.video?.version || 0;
@@ -58,7 +62,8 @@ export class EmbedController {
       return this.embedFile('manifest.json');
     } else {
       const url = new URL(`${API.baseUrl}/collection/${this.token}`);
-      if (this.embed && this.embed?.length > 1) url.searchParams.append('embed', this.embed);
+      if (this.embed && this.embed?.length > 1)
+        url.searchParams.append('embed', this.embed);
       return url.toString();
     }
   }
@@ -66,6 +71,7 @@ export class EmbedController {
   set embed(value: string) {
     if (this._embed != value) {
       this._embed = value;
+      this.loading = true;
       this.host.requestUpdate();
     }
   }
@@ -97,7 +103,7 @@ export class EmbedController {
     if (this._version) {
       return `/v${this._version}/`;
     }
-    return '/'
+    return '/';
   }
 
   set version(value: number) {
@@ -112,7 +118,9 @@ export class EmbedController {
   }
 
   embedFile(file: string, params = new URLSearchParams()): string {
-    const url = new URL(`${this.cdnRoot}/${this.embedId}${file == 'manifest' ? '/' : this.version}${file}`);
+    const url = new URL(
+      `${this.cdnRoot}/${this.embedId}${file == 'manifest' ? '/' : this.version}${file}`,
+    );
     if (this.token) params.append('token', this.token);
     if (!this.caching) params.append('e', new Date().getTime().toString());
     url.search = params.toString();