diff --git a/.github/workflows/deploy-prod.yml b/.github/workflows/deploy-prod.yml
index b515cc6..1234fea 100644
--- a/.github/workflows/deploy-prod.yml
+++ b/.github/workflows/deploy-prod.yml
@@ -20,6 +20,8 @@ jobs:
           node-version: 20
       - name: Install Dependencies
         run: npm install
+      - name: Copy ENV variables
+        run: cp -f src/environments/environment.prod.ts src/environments/environment.ts
       - name: Build project
         run: npm run build
       - name: Publish to Cloudflare Pages
diff --git a/src/app/@api/collection.api.ts b/src/app/@api/collection.api.ts
index 82cce63..52da99a 100644
--- a/src/app/@api/collection.api.ts
+++ b/src/app/@api/collection.api.ts
@@ -56,9 +56,6 @@ export class CollectionApi extends BaseApi<Collection> {
   public update = (req: WenRequest): Observable<Collection | undefined> =>
     this.request(WEN_FUNC.updateCollection, req);
 
-  public approve = (req: WenRequest): Observable<Collection | undefined> =>
-    this.request(WEN_FUNC.approveCollection, req);
-
   public reject = (req: WenRequest): Observable<Collection | undefined> =>
     this.request(WEN_FUNC.rejectCollection, req);
 }
diff --git a/src/app/components/collection/components/collection-highlight-card/collection-highlight-card.component.ts b/src/app/components/collection/components/collection-highlight-card/collection-highlight-card.component.ts
index d9e50f5..1eaff8a 100644
--- a/src/app/components/collection/components/collection-highlight-card/collection-highlight-card.component.ts
+++ b/src/app/components/collection/components/collection-highlight-card/collection-highlight-card.component.ts
@@ -57,9 +57,11 @@ export class CollectionHighlightCardComponent implements OnDestroy {
     this.collections.forEach((collection) => {
       const space$ = new BehaviorSubject<Space | undefined>(undefined);
       this.spaces$.push(space$);
-      this.subscriptions$.push(
-        this.spaceApi.listen(collection?.space).pipe(untilDestroyed(this)).subscribe(space$),
-      );
+      if (collection?.space) {
+        this.subscriptions$.push(
+          this.spaceApi.listen(collection?.space).pipe(untilDestroyed(this)).subscribe(space$),
+        );
+      }
     });
   }
 
diff --git a/src/app/pages/collection/pages/collection/collection-about/collection-about.component.html b/src/app/pages/collection/pages/collection/collection-about/collection-about.component.html
index 4cf058f..c100366 100644
--- a/src/app/pages/collection/pages/collection/collection-about/collection-about.component.html
+++ b/src/app/pages/collection/pages/collection/collection-about/collection-about.component.html
@@ -17,11 +17,7 @@
     nzType="primary"
     nzSize="default"
     class="w-full"
-    *ngIf="
-      (isGuardianWithinSpace$ | async) &&
-      !helper.isMinted(data.collection$ | async) &&
-      (data.collection$ | async)?.approved === true
-    "
+    *ngIf="(isGuardianWithinSpace$ | async) && !helper.isMinted(data.collection$ | async)"
     [disabled]="helper.mintInProgress(data.collection$ | async)"
     (click)="isMintOnNetorkVisible = true"
   >
@@ -33,15 +29,12 @@
         >...)
       </ng-container>
     </ng-container>
-    <ng-template #mintText i18n>Mint Collection</ng-template>
+    <ng-template #mintText i18n>Mint & Publish Collection</ng-template>
   </button>
 
   <div
     class="font-medium"
-    *ngIf="
-      !helper.isMinted(data.collection$ | async) &&
-      ((isGuardianWithinSpace$ | async) === false || (data.collection$ | async)?.approved !== true)
-    "
+    *ngIf="!helper.isMinted(data.collection$ | async) && (isGuardianWithinSpace$ | async) === false"
     i18n
   >
     Collection is not yet migrated to the decentralized network.
diff --git a/src/app/pages/collection/pages/collection/collection.page.html b/src/app/pages/collection/pages/collection/collection.page.html
index b6d0c39..7fb5b0a 100644
--- a/src/app/pages/collection/pages/collection/collection.page.html
+++ b/src/app/pages/collection/pages/collection/collection.page.html
@@ -69,18 +69,6 @@
       <h1 class="mt-3 mb-0 lg:mt-2">{{ (data.collection$ | async)?.name }}</h1>
 
       <div class="w-full mt-10 mb-4 space-y-4" *ngIf="(deviceService.isMobile$ | async)">
-        <button
-          nz-button
-          nzType="primary"
-          (click)="approve()"
-          *ngIf="data.isPending(data.collection$ | async) && (data.isGuardianWithinSpace$ | async)"
-          nzBlock
-          nzSize="large"
-          i18n
-        >
-          Publish Collection
-        </button>
-
         <button
           nz-button
           class="wen-secondary"
@@ -289,18 +277,6 @@ <h1 class="mt-3 mb-0 lg:mt-2">{{ (data.collection$ | async)?.name }}</h1>
       style="max-width: 450px"
       *ngIf="(deviceService.isDesktop$ | async)"
     >
-      <button
-        nz-button
-        nzType="primary"
-        (click)="approve()"
-        *ngIf="data.isPending(data.collection$ | async) && (data.isGuardianWithinSpace$ | async)"
-        nzBlock
-        nzSize="large"
-        i18n
-      >
-        Publish Collection
-      </button>
-
       <button
         nz-button
         class="wen-secondary"
diff --git a/src/app/pages/collection/pages/collection/collection.page.ts b/src/app/pages/collection/pages/collection/collection.page.ts
index f62dd24..2094b3c 100644
--- a/src/app/pages/collection/pages/collection/collection.page.ts
+++ b/src/app/pages/collection/pages/collection/collection.page.ts
@@ -115,7 +115,7 @@ export class CollectionPage implements OnInit, OnDestroy {
           this.guardiansSubscription$.unsubscribe();
         }
 
-        if (this.auth.member$.value?.uid) {
+        if (this.auth.member$.value?.uid && obj.space) {
           this.guardiansSubscription$ = this.spaceApi
             .isGuardianWithinSpace(obj.space, this.auth.member$.value.uid)
             .pipe(untilDestroyed(this))
@@ -141,9 +141,11 @@ export class CollectionPage implements OnInit, OnDestroy {
 
     this.data.collection$.pipe(skip(1), first()).subscribe(async (p) => {
       if (p) {
-        this.subscriptions$.push(
-          this.spaceApi.listen(p.space).pipe(untilDestroyed(this)).subscribe(this.data.space$),
-        );
+        if (p.space) {
+          this.subscriptions$.push(
+            this.spaceApi.listen(p.space).pipe(untilDestroyed(this)).subscribe(this.data.space$),
+          );
+        }
         if (p.royaltiesSpace) {
           this.subscriptions$.push(
             this.spaceApi
@@ -200,25 +202,6 @@ export class CollectionPage implements OnInit, OnDestroy {
     return CollectionType;
   }
 
-  public async approve(): Promise<void> {
-    if (!this.data.collection$.value?.uid) {
-      return;
-    }
-
-    await this.auth.sign(
-      {
-        uid: this.data.collection$.value.uid,
-      },
-      (sc, finish) => {
-        this.notification
-          .processRequest(this.collectionApi.approve(sc), 'Approved.', finish)
-          .subscribe(() => {
-            // none.
-          });
-      },
-    );
-  }
-
   public async reject(): Promise<void> {
     if (!this.data.collection$.value?.uid) {
       return;
diff --git a/src/app/pages/collection/pages/upsert/upsert.page.ts b/src/app/pages/collection/pages/upsert/upsert.page.ts
index d436447..bf7af2d 100644
--- a/src/app/pages/collection/pages/upsert/upsert.page.ts
+++ b/src/app/pages/collection/pages/upsert/upsert.page.ts
@@ -479,7 +479,7 @@ export class UpsertPage implements OnInit, OnDestroy {
   public getSpaceListOptions(list?: Space[] | null): SelectSpaceOption[] {
     return (list || [])
       .filter((o) => {
-        return !!(o.validatedAddress || {})[DEFAULT_NETWORK];
+        return !!(o?.validatedAddress || {})[DEFAULT_NETWORK];
       })
       .map((o) => ({
         label: o.name || o.uid,
diff --git a/src/app/pages/token/pages/token/token.page.ts b/src/app/pages/token/pages/token/token.page.ts
index 32ba089..9c6371f 100644
--- a/src/app/pages/token/pages/token/token.page.ts
+++ b/src/app/pages/token/pages/token/token.page.ts
@@ -101,9 +101,11 @@ export class TokenPage implements OnInit, OnDestroy {
               o === 'image' ? t.overviewGraphics : undefined,
             );
           });
-        this.subscriptions$.push(
-          this.spaceApi.listen(t.space).pipe(untilDestroyed(this)).subscribe(this.data.space$),
-        );
+        if (t.space) {
+          this.subscriptions$.push(
+            this.spaceApi.listen(t.space).pipe(untilDestroyed(this)).subscribe(this.data.space$),
+          );
+        }
         this.subscriptions$.push(
           this.tokenApi
             .getDistributionsLive(t.uid)
@@ -218,10 +220,12 @@ export class TokenPage implements OnInit, OnDestroy {
       this.memberDistributionSub$ = this.tokenApi
         .getMembersDistribution(this.data.token$.value?.uid, member.uid)
         .subscribe(this.data.memberDistribution$);
-      this.guardiansSubscription$ = this.spaceApi
-        .isGuardianWithinSpace(this.data.token$.value?.space, member?.uid)
-        .pipe(untilDestroyed(this))
-        .subscribe(this.isGuardianWithinSpace$);
+      if (this.data.token$.value?.space) {
+        this.guardiansSubscription$ = this.spaceApi
+          .isGuardianWithinSpace(this.data.token$.value?.space, member?.uid)
+          .pipe(untilDestroyed(this))
+          .subscribe(this.isGuardianWithinSpace$);
+      }
     } else {
       this.data.memberDistribution$?.next(undefined);
     }
diff --git a/src/app/pages/token/pages/trade/trade.page.ts b/src/app/pages/token/pages/trade/trade.page.ts
index 34cc0df..f046116 100644
--- a/src/app/pages/token/pages/trade/trade.page.ts
+++ b/src/app/pages/token/pages/trade/trade.page.ts
@@ -272,9 +272,11 @@ export class TradePage implements OnInit, OnDestroy {
               o === 'image' ? t.overviewGraphics : undefined,
             );
           });
-        this.subscriptions$.push(
-          this.spaceApi.listen(t.space).pipe(untilDestroyed(this)).subscribe(this.data.space$),
-        );
+        if (t.space) {
+          this.subscriptions$.push(
+            this.spaceApi.listen(t.space).pipe(untilDestroyed(this)).subscribe(this.data.space$),
+          );
+        }
         this.listenToMemberSubs(this.auth.member$.value);
         this.isFavourite = ((getItem(StorageItem.FavouriteTokens) as string[]) || []).includes(
           t.uid,