diff --git a/packages/beacon-dapp/src/events.ts b/packages/beacon-dapp/src/events.ts
index 295ced685..59c99172f 100644
--- a/packages/beacon-dapp/src/events.ts
+++ b/packages/beacon-dapp/src/events.ts
@@ -1,5 +1,5 @@
+import { BlockExplorer } from './utils/block-explorer'
 import {
-  BlockExplorer,
   openAlert,
   AlertButton,
   AlertConfig,
@@ -7,7 +7,7 @@ import {
   closeToast,
   openToast,
   ToastAction
-} from '@airgap/beacon-dapp'
+} from '@airgap/beacon-ui'
 import {
   BeaconErrorType,
   ExtendedPostMessagePairingResponse,
diff --git a/packages/beacon-dapp/src/index.ts b/packages/beacon-dapp/src/index.ts
index c74a2c721..a90cb05f6 100644
--- a/packages/beacon-dapp/src/index.ts
+++ b/packages/beacon-dapp/src/index.ts
@@ -1,10 +1,3 @@
-export * from '@airgap/beacon-core'
-export * from '@airgap/beacon-transport-matrix'
-export * from '@airgap/beacon-transport-postmessage'
-export * from '@airgap/beacon-types'
-export * from '@airgap/beacon-utils'
-export * from '@airgap/beacon-ui'
-
 import { DAppClient } from './dapp-client/DAppClient'
 import { DAppClientOptions } from './dapp-client/DAppClientOptions'
 import { BeaconEvent, BeaconEventHandler, defaultEventCallbacks } from './events'
diff --git a/packages/beacon-wallet/src/index.ts b/packages/beacon-wallet/src/index.ts
index 7e52986b7..57f869600 100644
--- a/packages/beacon-wallet/src/index.ts
+++ b/packages/beacon-wallet/src/index.ts
@@ -1,8 +1,3 @@
-export * from '@airgap/beacon-core'
-export * from '@airgap/beacon-transport-matrix'
-export * from '@airgap/beacon-types'
-export * from '@airgap/beacon-utils'
-
 import { WalletClient } from './client/WalletClient'
 import { WalletClientOptions } from './client/WalletClientOptions'