diff --git a/database/src/factories/transaction-signature.factory.ts b/database/src/factories/transaction-signature.factory.ts
deleted file mode 100644
index b79e15052..000000000
--- a/database/src/factories/transaction-signature.factory.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import Faker from 'faker'
-import { define } from 'typeorm-seeding'
-import { TransactionSignature } from '../../entity/TransactionSignature'
-import { TransactionSignatureContext } from '../interface/TransactionContext'
-import { randomBytes } from 'crypto'
-
-define(TransactionSignature, (faker: typeof Faker, context?: TransactionSignatureContext) => {
-  if (!context || !context.transaction) {
-    throw new Error('TransactionSignature: No transaction present!')
-  }
-
-  const transactionSignature = new TransactionSignature()
-  transactionSignature.signature = context.signature ? context.signature : randomBytes(64)
-  transactionSignature.pubkey = context.pubkey ? context.pubkey : randomBytes(32)
-  transactionSignature.transaction = context.transaction
-
-  return transactionSignature
-})
diff --git a/database/src/factories/transaction.factory.ts b/database/src/factories/transaction.factory.ts
index 4880ace5b..10d242265 100644
--- a/database/src/factories/transaction.factory.ts
+++ b/database/src/factories/transaction.factory.ts
@@ -12,7 +12,8 @@ define(Transaction, (faker: typeof Faker, context?: TransactionContext) => {
   transaction.txHash = context.txHash ? context.txHash : randomBytes(48)
   transaction.memo = context.memo || context.memo === '' ? context.memo : faker.lorem.sentence()
   transaction.received = context.received ? context.received : new Date()
-  transaction.blockchainTypeId = context.blockchainTypeId ? context.blockchainTypeId : 1
+  transaction.signature = context.signature ? context.signature : randomBytes(64)
+  transaction.pubkey = context.signaturePubkey ? context.signaturePubkey : randomBytes(32)
   if (context.transactionSendCoin) transaction.transactionSendCoin = context.transactionSendCoin
   if (context.transactionCreation) transaction.transactionCreation = context.transactionCreation
 
diff --git a/database/src/interface/TransactionContext.ts b/database/src/interface/TransactionContext.ts
index 481959c5f..15b66bad6 100644
--- a/database/src/interface/TransactionContext.ts
+++ b/database/src/interface/TransactionContext.ts
@@ -9,6 +9,8 @@ export interface TransactionContext {
   memo?: string
   received?: Date
   blockchainTypeId?: number
+  signature?: Buffer
+  signaturePubkey?: Buffer
   transactionSendCoin?: TransactionSendCoin
   transactionCreation?: TransactionCreation
 }
@@ -43,10 +45,6 @@ export interface UserTransactionContext {
   transactionTypeId?: number
   balance?: number
   balanceDate?: Date
-}
-
-export interface TransactionSignatureContext {
   signature?: Buffer
   pubkey?: Buffer
-  transaction?: Transaction
 }
diff --git a/database/src/seeds/helpers/user-helpers.ts b/database/src/seeds/helpers/user-helpers.ts
index e1e33a94b..0e7908cc9 100644
--- a/database/src/seeds/helpers/user-helpers.ts
+++ b/database/src/seeds/helpers/user-helpers.ts
@@ -10,7 +10,6 @@ import {
   TransactionContext,
   TransactionCreationContext,
   UserTransactionContext,
-  TransactionSignatureContext,
 } from '../../interface/TransactionContext'
 import { UserInterface } from '../../interface/UserInterface'
 import { User } from '../../../entity/User'
@@ -20,7 +19,6 @@ import { ServerUser } from '../../../entity/ServerUser'
 import { LoginUserRoles } from '../../../entity/LoginUserRoles'
 import { Balance } from '../../../entity/Balance'
 import { Transaction } from '../../../entity/Transaction'
-import { TransactionSignature } from '../../../entity/TransactionSignature'
 import { UserTransaction } from '../../../entity/UserTransaction'
 import { TransactionCreation } from '../../../entity/TransactionCreation'
 import { Factory } from 'typeorm-seeding'
@@ -51,9 +49,6 @@ export const userSeeder = async (factory: Factory, userData: UserInterface): Pro
     await factory(UserTransaction)(
       createUserTransactionContext(userData, user, transaction),
     ).create()
-    await factory(TransactionSignature)(
-      createTransactionSignatureContext(userData, transaction),
-    ).create()
   }
 }
 
@@ -166,16 +161,7 @@ const createUserTransactionContext = (
     transactionTypeId: transaction.transactionTypeId,
     balance: context.amount,
     balanceDate: context.recordDate,
-  }
-}
-
-const createTransactionSignatureContext = (
-  context: UserInterface,
-  transaction: Transaction,
-): TransactionSignatureContext => {
-  return {
     signature: context.signature,
     pubkey: context.signaturePubkey,
-    transaction,
   }
 }