diff --git a/src/plugins/oSnap/Create.vue b/src/plugins/oSnap/Create.vue
index d9f8b443..f19d59b3 100644
--- a/src/plugins/oSnap/Create.vue
+++ b/src/plugins/oSnap/Create.vue
@@ -1,28 +1,15 @@
 <script setup lang="ts">
 import { ExtendedSpace } from '@/helpers/interfaces';
-import { formatUnits } from '@ethersproject/units';
 import { cloneDeep } from 'lodash';
-import SelectSafe from './components/Input/SelectSafe.vue';
-import TransactionBuilder from './components/TransactionBuilder/TransactionBuilder.vue';
 import {
-  BalanceResponse,
   GnosisSafe,
-  NFT,
   Network,
   OsnapPluginData,
-  Token,
   Transaction,
   nonNullable
 } from './types';
-import {
-  getGnosisSafeBalances,
-  getGnosisSafeCollectibles,
-  getIsOsnapEnabled,
-  getModuleAddressForTreasury,
-  getNativeAsset
-} from './utils';
-import OsnapMarketingWidget from './components/OsnapMarketingWidget.vue';
-import BotSupportWarning from './components/BotSupportWarning.vue';
+import { getIsOsnapEnabled, getModuleAddressForTreasury } from './utils';
+import CreateSafe from './CreateSafe.vue';
 import { toChecksumAddress } from '@/helpers/utils';
 
 const props = defineProps<{
@@ -40,121 +27,36 @@ const emit = defineEmits<{
 }>();
 
 const newPluginData = ref<OsnapPluginData>({
-  safe: null
+  safes: null
 });
 
-const safes = ref<GnosisSafe[]>([]);
-const tokens = ref<Token[]>([]);
-const collectables = ref<NFT[]>([]);
-
-function addTransaction(transaction: Transaction) {
-  if (newPluginData.value.safe === null) return;
-  newPluginData.value.safe.transactions.push(transaction);
-}
-
-function removeTransaction(transactionIndex: number) {
-  if (!newPluginData.value.safe) return;
-  newPluginData.value.safe.transactions.splice(transactionIndex, 1);
-}
-
-function updateTransaction(transaction: Transaction, transactionIndex: number) {
-  if (!newPluginData.value.safe) return;
-  newPluginData.value.safe.transactions[transactionIndex] = transaction;
-}
-
-async function fetchTokens(url: string): Promise<Token[]> {
-  try {
-    const response = await fetch(url);
-    const data = await response.json();
-    return data.verifiedTokens?.tokens || data.tokens || [];
-  } catch {
-    return [];
-  }
-}
-
-async function fetchBalances(network: Network, safeAddress: string) {
-  if (!safeAddress) {
-    return [];
-  }
-  try {
-    const balances = await getGnosisSafeBalances(network, safeAddress);
-    const balancesWithNative = balances.map(balance => {
-      if (!balance.tokenAddress || !balance.token) {
-        return {
-          ...balance,
-          token: getNativeAsset(network),
-          tokenAddress: 'main'
-        };
-      }
-      return balance;
-    });
+const updateSafes = (safes: GnosisSafe[]) => {
+  newPluginData.value = { safes };
+  emit('update', { key: 'oSnap', form: newPluginData.value });
+};
 
-    const tokens = await fetchTokens('https://tokens.uniswap.org');
+const allSafes = ref<GnosisSafe[]>([]);
+const configuredSafes = computed(() => newPluginData.value.safes ?? []);
 
-    return enhanceTokensWithBalances(balancesWithNative, tokens, network);
-  } catch (e) {
-    console.warn('Error fetching balances', e);
-    return [];
+const unconfiguredSafes = computed<GnosisSafe[]>(() => {
+  if (newPluginData.value?.safes?.length && configuredSafes.value.length) {
+    return allSafes.value.filter(safe =>
+      !!findSafe(safe, configuredSafes.value) ? false : true
+    );
   }
-}
-
-function enhanceTokensWithBalances(
-  balances: Partial<BalanceResponse>[],
-  tokens: Token[],
-  network: Network
-) {
-  return balances
-    .filter(
-      (balance): balance is BalanceResponse =>
-        !!balance.token && !!balance.tokenAddress && !!balance.balance
-    )
-    .map(balance => enhanceTokenWithBalance(balance, tokens, network))
-    .sort((a, b) => {
-      if (a.address === 'main' && b.address !== 'main') return -1;
-      if (!(a.address === 'main') && b.address === 'main') return 1;
-      if (a.verified && !b.verified) return -1;
-      if (!a.verified && b.verified) return +1;
-      if (!a.balance || !b.balance) return 0;
-      if (parseFloat(a.balance) > parseFloat(b.balance)) return -1;
-      return 0;
-    });
-}
-
-// gets token balances and also determines if the token is verified
-function enhanceTokenWithBalance(
-  balance: BalanceResponse,
-  tokens: Token[],
-  network: Network
-): Token {
-  const verifiedToken = getVerifiedToken(balance.tokenAddress, tokens);
-  return {
-    ...balance.token,
-    address: balance.tokenAddress,
-    balance: balance.balance
-      ? formatUnits(balance.balance, balance.token.decimals)
-      : '0',
-    verified: !!verifiedToken,
-    chainId: network
-  };
-}
+  return allSafes.value;
+});
 
-function getVerifiedToken(tokenAddress: string, tokens: Token[]) {
-  return tokens.find(
-    token => token.address.toLowerCase() === tokenAddress.toLowerCase()
+function safeEqual(safe1: GnosisSafe, safe2: GnosisSafe): boolean {
+  return (
+    safe1.safeAddress === safe2.safeAddress && safe1.network === safe1.network
   );
 }
 
-async function fetchCollectibles(network: Network, gnosisSafeAddress: string) {
-  try {
-    const response = await getGnosisSafeCollectibles(
-      network,
-      gnosisSafeAddress
-    );
-    return response.results;
-  } catch (error) {
-    console.warn('Error fetching collectibles');
-  }
-  return [];
+function findSafe(safeToFind: GnosisSafe, from: GnosisSafe[]) {
+  return from.length
+    ? from.find(safe => safeEqual(safe, safeToFind))
+    : undefined;
 }
 
 // maps over the treasuries and creates a safe for each one
@@ -199,54 +101,47 @@ async function createOsnapEnabledSafes() {
   return safes;
 }
 
-// when changing safes, we create a whole new object and replace it
-function updateSafe(safe: GnosisSafe) {
-  newPluginData.value.safe = cloneDeep(safe);
-  update(newPluginData.value);
+function addSafeToConfigure(safe: GnosisSafe) {
+  updateSafes([...(newPluginData.value.safes ?? []), safe]);
 }
 
-const update = (newPluginData: OsnapPluginData) => {
-  emit('update', { key: 'oSnap', form: newPluginData });
-};
-
-async function loadBalancesAndCollectibles() {
-  if (!newPluginData.value.safe?.safeAddress) return;
-  isLoading.value = true;
-  tokens.value = await fetchBalances(
-    newPluginData.value.safe.network,
-    newPluginData.value.safe.safeAddress
-  );
-  collectables.value = await fetchCollectibles(
-    newPluginData.value.safe.network,
-    newPluginData.value.safe.safeAddress
-  );
+function addNewSafe() {
+  addSafeToConfigure(unconfiguredSafes.value[0]);
+}
 
-  isLoading.value = false;
+function removeSafe(safeIndex: number) {
+  const copy = [...configuredSafes.value];
+  copy.splice(safeIndex, 1);
+  updateSafes(copy);
 }
 
-watch(
-  () => [
-    newPluginData.value.safe?.safeAddress,
-    newPluginData.value.safe?.network
-  ],
-  async () => {
-    await loadBalancesAndCollectibles();
-    update(newPluginData.value);
-  }
-);
+function updateSafe(safe: GnosisSafe, safeIndex: number) {
+  const copy = [...configuredSafes.value];
+  copy[safeIndex] = safe;
+  updateSafes(copy);
+}
 
 onMounted(async () => {
   isLoading.value = true;
-  safes.value = await createOsnapEnabledSafes();
-  newPluginData.value.safe = cloneDeep(safes.value[0]);
-  await loadBalancesAndCollectibles();
-  update(newPluginData.value);
+  allSafes.value = await createOsnapEnabledSafes();
+  const initialSafe = cloneDeep(allSafes.value[0]);
+  updateSafes([initialSafe]);
   isLoading.value = false;
 });
 </script>
 
 <template>
-  <template v-if="hasLegacyPluginInstalled">
+  <template v-if="!space.treasuries.length">
+    <h2>Warning: no treasuries</h2>
+    <p>
+      You have installed the oSnap plugin, but you don't have any treasuries.
+    </p>
+    <p>
+      Please add a Safe as a treasury and enable oSnap on it to use the oSnap
+      plugin.
+    </p>
+  </template>
+  <template v-else-if="hasLegacyPluginInstalled">
     <div class="rounded-2xl border p-4 text-md">
       <h2 class="mb-2">Warning: Multiple oSnap enabled plugins detected</h2>
       <p class="mb-2">
@@ -255,66 +150,39 @@ onMounted(async () => {
       </p>
     </div>
   </template>
-  <template v-else>
-    <div v-if="isLoading" class="grid min-h-[180px] place-items-center">
+
+  <template v-else-if="isLoading">
+    <div class="grid min-h-[180px] place-items-center">
       <h2 class="text-center">
         Loading oSnap Safes <LoadingSpinner class="ml-2 inline" big />
       </h2>
     </div>
-    <div v-else class="rounded-2xl border p-4 relative">
-      <OsnapMarketingWidget class="absolute top-[-16px] right-[16px]" />
-      <template v-if="space.treasuries.length === 0">
-        <h2>Warning: no treasuries</h2>
-        <p>
-          You have installed the oSnap plugin, but you don't have any
-          treasuries.
-        </p>
-        <p>
-          Please add a Safe as a treasury and enable oSnap on it to use the
-          oSnap plugin.
-        </p>
-      </template>
-      <template v-else-if="safes.length === 0">
-        <h2>Warning: no oSnap safes found</h2>
-        <p>
-          You have installed the oSnap plugin, but you don't have any oSnap
-          safes.
-        </p>
-        <p>
-          Please add a Safe as a treasury and enable oSnap on it to use the
-          oSnap plugin.
-        </p>
-      </template>
-      <template v-else>
-        <h2 class="text-md">Add oSnap transactions</h2>
-        <h3 class="text-base">Pick a safe</h3>
-        <SelectSafe
-          :safes="safes"
-          :selectedSafe="newPluginData.safe"
-          @updateSafe="updateSafe($event)"
-        />
-        <BotSupportWarning
-          v-if="newPluginData.safe"
-          :safe-address="newPluginData.safe?.safeAddress"
-          :chain-id="newPluginData.safe?.network"
-        />
-        <div class="mt-4 border-b last:border-b-0">
-          <TransactionBuilder
-            v-if="!!newPluginData.safe"
-            :space="space"
-            :safe-address="newPluginData.safe.safeAddress"
-            :module-address="newPluginData.safe.moduleAddress"
-            :tokens="tokens"
-            :collectables="collectables"
-            :network="newPluginData.safe.network"
-            :transactions="newPluginData.safe.transactions"
-            :safe="newPluginData.safe"
-            @add-transaction="addTransaction"
-            @remove-transaction="removeTransaction"
-            @update-transaction="updateTransaction"
-          />
-        </div>
-      </template>
-    </div>
   </template>
+  <template v-else-if="!allSafes.length">
+    <h2>Warning: no oSnap safes found</h2>
+    <p>
+      You have installed the oSnap plugin, but you don't have any oSnap safes.
+    </p>
+    <p>
+      Please add a Safe as a treasury and enable oSnap on it to use the oSnap
+      plugin.
+    </p>
+  </template>
+  <div class="flex flex-col gap-6" v-else>
+    <CreateSafe
+      v-for="(safe, i) in newPluginData.safes"
+      :key="`${safe.network}:${safe.safeAddress}`"
+      :safe-index="i"
+      :safe="safe"
+      @remove-safe="removeSafe"
+      @update-safe="updateSafe"
+      :all-safes="allSafes"
+    />
+  </div>
+  <TuneButton
+    v-if="unconfiguredSafes.length"
+    class="mt-4 w-full"
+    @click="addNewSafe"
+    >Add Batch</TuneButton
+  >
 </template>
diff --git a/src/plugins/oSnap/CreateSafe.vue b/src/plugins/oSnap/CreateSafe.vue
new file mode 100644
index 00000000..afc30239
--- /dev/null
+++ b/src/plugins/oSnap/CreateSafe.vue
@@ -0,0 +1,132 @@
+<script setup lang="ts">
+import { GnosisSafe, NFT, Token, Transaction } from './types';
+import { fetchBalances, fetchCollectibles } from './utils';
+import { cloneDeep } from 'lodash';
+import SelectSafe from './components/Input/SelectSafe.vue';
+import TransactionBuilder from './components/TransactionBuilder/TransactionBuilder.vue';
+import OsnapMarketingWidget from './components/OsnapMarketingWidget.vue';
+import BotSupportWarning from './components/BotSupportWarning.vue';
+
+// PROPS
+const props = defineProps<{
+  allSafes: GnosisSafe[];
+  safe: GnosisSafe;
+  safeIndex: number;
+}>();
+
+// VARS
+const configuredSafe = ref<GnosisSafe | null>(null);
+const tokens = ref<Token[]>([]);
+const collectibles = ref<NFT[]>([]);
+const isLoading = ref(false);
+
+// EMITS
+
+// emits an event with the shape expected by the parent of the plugin component
+const emit = defineEmits<{
+  updateSafe: [value: GnosisSafe, index: number];
+  addSafe: [value: GnosisSafe];
+  removeSafe: [value: number];
+}>();
+
+// METHODS
+function update(newlyConfiguredSafe: GnosisSafe) {
+  emit('updateSafe', newlyConfiguredSafe, props.safeIndex);
+}
+
+// METHODS
+function removeSafe() {
+  if (configuredSafe.value) {
+    emit('removeSafe', props.safeIndex);
+  }
+}
+
+// when changing safes, we create a whole new object and replace it
+function replaceSafe(safe: GnosisSafe | null) {
+  if (!safe) return;
+  configuredSafe.value = cloneDeep(safe);
+  update(configuredSafe.value);
+}
+
+function addTransaction(transaction: Transaction) {
+  if (configuredSafe.value === null) return;
+  configuredSafe.value.transactions.push(transaction);
+}
+
+function removeTransaction(transactionIndex: number) {
+  if (!configuredSafe.value) return;
+  configuredSafe.value.transactions.splice(transactionIndex, 1);
+}
+
+function updateTransaction(transaction: Transaction, transactionIndex: number) {
+  if (!configuredSafe.value) return;
+  configuredSafe.value.transactions[transactionIndex] = transaction;
+}
+
+// fetch tokens and nfts for selected safe
+async function loadBalancesAndCollectibles() {
+  if (!configuredSafe.value?.safeAddress) return;
+  isLoading.value = true;
+  tokens.value = await fetchBalances(
+    configuredSafe.value.network,
+    configuredSafe.value.safeAddress
+  );
+  collectibles.value = await fetchCollectibles(
+    configuredSafe.value.network,
+    configuredSafe.value.safeAddress
+  );
+  isLoading.value = false;
+}
+
+async function loadBalancesAndUpdate() {
+  isLoading.value = true;
+  // fetch tokens and nfts
+  await loadBalancesAndCollectibles();
+  isLoading.value = false;
+
+  if (configuredSafe.value) {
+    update(configuredSafe.value);
+  }
+}
+
+watch(
+  () => [configuredSafe.value?.safeAddress, configuredSafe.value?.network],
+  loadBalancesAndUpdate
+);
+
+onMounted(async () => {
+  // take the first safe available
+  configuredSafe.value = cloneDeep(props.safe);
+  loadBalancesAndUpdate();
+});
+</script>
+
+<template>
+  <div class="rounded-2xl border p-4 relative">
+    <OsnapMarketingWidget class="absolute top-[-16px] right-[16px]" />
+    <button class="text-red" @click="removeSafe">Remove Batch</button>
+    <h2 class="text-md">Add oSnap transactions</h2>
+    <h3 class="text-base">Pick a safe</h3>
+    <SelectSafe
+      :safes="allSafes"
+      :selectedSafe="configuredSafe"
+      @updateSafe="replaceSafe($event)"
+    />
+    <BotSupportWarning
+      v-if="configuredSafe"
+      :safe-address="configuredSafe.safeAddress"
+      :chain-id="configuredSafe.network"
+    />
+    <div class="mt-4 border-b last:border-b-0">
+      <TransactionBuilder
+        v-if="!!configuredSafe"
+        :safe="configuredSafe"
+        :tokens="tokens"
+        :collectibles="collectibles"
+        @add-transaction="addTransaction"
+        @remove-transaction="removeTransaction"
+        @update-transaction="updateTransaction"
+      />
+    </div>
+  </div>
+</template>
diff --git a/src/plugins/oSnap/components/TransactionBuilder/TransactionBuilder.vue b/src/plugins/oSnap/components/TransactionBuilder/TransactionBuilder.vue
index e96ee5e6..b19db19c 100644
--- a/src/plugins/oSnap/components/TransactionBuilder/TransactionBuilder.vue
+++ b/src/plugins/oSnap/components/TransactionBuilder/TransactionBuilder.vue
@@ -1,10 +1,8 @@
 <script setup lang="ts">
-import { ExtendedSpace, Proposal, Results } from '@/helpers/interfaces';
 import { shorten } from '@/helpers/utils';
 import {
   GnosisSafe,
   NFT,
-  Network,
   SafeImportTransaction,
   Transaction as TTransaction,
   Token
@@ -15,16 +13,9 @@ import TenderlySimulation from './TenderlySimulation.vue';
 import TransactionImport from './TransactionImport.vue';
 
 const props = defineProps<{
-  safeAddress: string;
-  moduleAddress: string;
   tokens: Token[];
-  collectables: NFT[];
-  network: Network;
-  transactions: TTransaction[];
-  proposal?: Proposal;
-  space: ExtendedSpace;
-  results?: Results;
-  safe: GnosisSafe | null;
+  collectibles: NFT[];
+  safe: GnosisSafe;
 }>();
 
 const emit = defineEmits<{
@@ -34,7 +25,7 @@ const emit = defineEmits<{
 }>();
 
 const safeLink = computed(() =>
-  getSafeAppLink(props.network, props.safeAddress)
+  getSafeAppLink(props.safe.network, props.safe.safeAddress)
 );
 
 function addImportedTransactions(transactions: SafeImportTransaction[]) {
@@ -50,44 +41,44 @@ function addImportedTransactions(transactions: SafeImportTransaction[]) {
       class="ml-2 inline-flex font-normal text-skin-text"
       target="_blank"
     >
-      {{ shorten(safeAddress) }}
+      {{ shorten(safe.safeAddress) }}
       <i-ho-external-link class="ml-1" />
     </a>
   </p>
   <p class="my-2">
     <strong>Module address</strong
     ><span class="ml-2 inline-block break-all">{{
-      shorten(moduleAddress)
+      shorten(safe.moduleAddress)
     }}</span>
   </p>
   <p class="my-2">
     <strong>Number of transactions</strong
-    ><span class="ml-2 inline-block">{{ transactions.length }}</span>
+    ><span class="ml-2 inline-block">{{ safe.transactions.length }}</span>
     <TransactionImport
       @update:imported-transactions="addImportedTransactions"
       :safe="props.safe"
-      :network="props.network"
+      :network="safe.network"
     />
   </p>
   <div class="text-center">
     <Transaction
-      v-for="(transaction, index) in transactions"
+      v-for="(transaction, index) in safe.transactions"
       :key="index"
       :transaction="transaction"
       :transaction-index="index"
-      :safe-address="safeAddress"
-      :module-address="moduleAddress"
+      :safe-address="safe.safeAddress"
+      :module-address="safe.moduleAddress"
       :tokens="tokens"
-      :collectables="collectables"
-      :network="props.network"
+      :collectables="collectibles"
+      :network="safe.network"
       @update-transaction="(...args) => emit('updateTransaction', ...args)"
       @remove-transaction="(...args) => emit('removeTransaction', ...args)"
     />
     <TenderlySimulation
-      v-if="transactions.length"
-      :transactions="transactions"
+      v-if="safe.transactions.length"
+      :transactions="safe.transactions"
       :safe="props.safe"
-      :network="props.network"
+      :network="safe.network"
       class="mt-4"
     />
   </div>
diff --git a/src/plugins/oSnap/types.ts b/src/plugins/oSnap/types.ts
index cd395508..78aaefe0 100644
--- a/src/plugins/oSnap/types.ts
+++ b/src/plugins/oSnap/types.ts
@@ -259,7 +259,7 @@ export type GnosisSafe = {
  * @field `safe` field is the safe that the plugin is currently working with.
  */
 export type OsnapPluginData = {
-  safe: GnosisSafe | null;
+  safes: GnosisSafe[] | null;
 };
 
 /**
diff --git a/src/plugins/oSnap/utils/getters.ts b/src/plugins/oSnap/utils/getters.ts
index e1256990..c371ab30 100644
--- a/src/plugins/oSnap/utils/getters.ts
+++ b/src/plugins/oSnap/utils/getters.ts
@@ -33,10 +33,13 @@ import {
   ProposalExecutedEvent,
   SafeNetworkPrefix,
   SpaceConfigResponse,
+  Token,
   TransactionsProposedEvent
 } from '../types';
 import { getPagedEvents } from './events';
 import { shortenAddress, toChecksumAddress } from '@/helpers/utils';
+import { getNativeAsset } from './coins';
+import { formatUnits } from '@ethersproject/units';
 
 /**
  * Calls the Gnosis Safe Transaction API
@@ -830,3 +833,101 @@ export async function isConfigCompliant(safeAddress: string, chainId: string) {
   const data = await res.json();
   return data as unknown as SpaceConfigResponse;
 }
+
+export async function fetchBalances(network: Network, safeAddress: string) {
+  if (!safeAddress) {
+    return [];
+  }
+  try {
+    const balances = await getGnosisSafeBalances(network, safeAddress);
+    const balancesWithNative = balances.map(balance => {
+      if (!balance.tokenAddress || !balance.token) {
+        return {
+          ...balance,
+          token: getNativeAsset(network),
+          tokenAddress: 'main'
+        };
+      }
+      return balance;
+    });
+
+    const tokens = await fetchTokens('https://tokens.uniswap.org');
+
+    return enhanceTokensWithBalances(balancesWithNative, tokens, network);
+  } catch (e) {
+    console.warn('Error fetching balances', e);
+    return [];
+  }
+}
+
+export async function fetchTokens(url: string): Promise<Token[]> {
+  try {
+    const response = await fetch(url);
+    const data = await response.json();
+    return data.verifiedTokens?.tokens || data.tokens || [];
+  } catch {
+    return [];
+  }
+}
+
+export function enhanceTokensWithBalances(
+  balances: Partial<BalanceResponse>[],
+  tokens: Token[],
+  network: Network
+) {
+  return balances
+    .filter(
+      (balance): balance is BalanceResponse =>
+        !!balance.token && !!balance.tokenAddress && !!balance.balance
+    )
+    .map(balance => enhanceTokenWithBalance(balance, tokens, network))
+    .sort((a, b) => {
+      if (a.address === 'main' && b.address !== 'main') return -1;
+      if (!(a.address === 'main') && b.address === 'main') return 1;
+      if (a.verified && !b.verified) return -1;
+      if (!a.verified && b.verified) return +1;
+      if (!a.balance || !b.balance) return 0;
+      if (parseFloat(a.balance) > parseFloat(b.balance)) return -1;
+      return 0;
+    });
+}
+
+// gets token balances and also determines if the token is verified
+function enhanceTokenWithBalance(
+  balance: BalanceResponse,
+  tokens: Token[],
+  network: Network
+): Token {
+  const verifiedToken = getVerifiedToken(balance.tokenAddress, tokens);
+  return {
+    ...balance.token,
+    address: balance.tokenAddress,
+    balance: balance.balance
+      ? formatUnits(balance.balance, balance.token.decimals)
+      : '0',
+    verified: !!verifiedToken,
+    chainId: network
+  };
+}
+
+function getVerifiedToken(tokenAddress: string, tokens: Token[]) {
+  return tokens.find(
+    token => token.address.toLowerCase() === tokenAddress.toLowerCase()
+  );
+}
+
+export async function fetchCollectibles(
+  network: Network,
+  gnosisSafeAddress: string
+) {
+  try {
+    const response = await getGnosisSafeCollectibles(
+      network,
+      gnosisSafeAddress
+    );
+    return response.results;
+  } catch (error) {
+    console.warn('Error fetching collectibles');
+  }
+  return [];
+}
diff --git a/src/views/SpaceCreate.vue b/src/views/SpaceCreate.vue
index afcbf5f1..cda8027c 100644
--- a/src/views/SpaceCreate.vue
+++ b/src/views/SpaceCreate.vue
@@ -141,16 +141,19 @@ const isFormValid = computed(() => {
     : true;
 
   const isOsnapPluginValid = (() => {
-    const osnapData = form.value.metadata.plugins.oSnap?.safe;
-    if (!osnapData) {
+    const safes = form.value.metadata.plugins.oSnap?.safes;
+    if (!safes) {
       //  not using osnap plugin
       return true;
     }
-    if (osnapData && !(osnapData.transactions.length > 0)) {
-      //  using osnap, but no transactions
+    if (safes.length && safes.some(safe => !(safe.transactions.length > 0))) {
+      //  using osnap, but some have no transactions
       return false;
     }
-    if (osnapData && !osnapData.transactions.every(tx => tx.isValid)) {
+    if (
+      safes &&
+      !safes.every(safe => safe.transactions.every(tx => tx.isValid))
+    ) {
       //  all transactions must be valid
       return false;
     }