diff --git a/services/addressService.ts b/services/addressService.ts
index 8b2ff273..65707cc9 100644
--- a/services/addressService.ts
+++ b/services/addressService.ts
@@ -2,7 +2,7 @@ import { Prisma, Address } from '@prisma/client'
 import prisma from 'prisma-local/clientInstance'
 import { RESPONSE_MESSAGES } from 'constants/index'
 import { fetchAddressTransactions } from 'services/transactionService'
-import { getNetworkFromSlug } from 'services/networkService'
+import { getNetworkIdFromSlug } from 'services/networkService'
 
 const addressWithTransactionAndNetwork = Prisma.validator<Prisma.AddressDefaultArgs>()({
   include: { transactions: true, network: true }
@@ -206,7 +206,7 @@ export async function upsertAddress (
   includeTransactions = false
 ): Promise<AddressWithTransactions> {
   const prefix = addressString.split(':')[0].toLowerCase()
-  const network = await getNetworkFromSlug(prefix)
+  const networkId = getNetworkIdFromSlug(prefix)
   const localPrisma = prismaTransaction ?? prisma
   return await localPrisma.address.upsert({
     where: {
@@ -214,7 +214,7 @@ export async function upsertAddress (
     },
     create: {
       address: addressString.toLowerCase(),
-      networkId: Number(network.id)
+      networkId
     },
     update: {
     },
diff --git a/tests/unittests/addressService.test.ts b/tests/unittests/addressService.test.ts
index aba26953..ce1c8c44 100644
--- a/tests/unittests/addressService.test.ts
+++ b/tests/unittests/addressService.test.ts
@@ -51,10 +51,13 @@ describe('Create by substring', () => {
   it('Create single address', async () => {
     prismaMock.address.upsert.mockResolvedValue(mockedBCHAddress)
     prisma.address.upsert = prismaMock.address.upsert
-    prismaMock.network.findUnique.mockResolvedValue(mockedNetwork)
-    prisma.network.findUnique = prismaMock.network.findUnique
 
     const result = await addressService.upsertAddress(mockedBCHAddress.address)
     expect(result).toEqual(mockedBCHAddress)
+    expect(prismaMock.address.upsert).toHaveBeenCalledWith(expect.objectContaining({
+      create: expect.objectContaining({
+        networkId: mockedBCHAddress.networkId
+      })
+    }))
   })
 })