diff --git a/packages/runtime/src/events/transport/DatawalletSynchronizedEvent.ts b/packages/runtime/src/events/transport/DatawalletSynchronizedEvent.ts
index 1e641701f..490398fa9 100644
--- a/packages/runtime/src/events/transport/DatawalletSynchronizedEvent.ts
+++ b/packages/runtime/src/events/transport/DatawalletSynchronizedEvent.ts
@@ -1,6 +1,6 @@
 import { DataEvent } from "../DataEvent";
 
-export class DatawalletSynchronizedEvent extends DataEvent<any> {
+export class DatawalletSynchronizedEvent extends DataEvent<undefined> {
     public static readonly namespace: string = "transport.datawalletSynchronized";
 
     public constructor(eventTargetAddress: string) {
diff --git a/packages/transport/src/events/DatawalletSynchronizedEvent.ts b/packages/transport/src/events/DatawalletSynchronizedEvent.ts
index 7ac5665bd..3edd9fca5 100644
--- a/packages/transport/src/events/DatawalletSynchronizedEvent.ts
+++ b/packages/transport/src/events/DatawalletSynchronizedEvent.ts
@@ -1,6 +1,6 @@
 import { TransportDataEvent } from "./TransportDataEvent";
 
-export class DatawalletSynchronizedEvent extends TransportDataEvent<any> {
+export class DatawalletSynchronizedEvent extends TransportDataEvent<undefined> {
     public static readonly namespace: string = "transport.datawalletSynchronized";
 
     public constructor(eventTargetAddress: string) {
diff --git a/packages/transport/src/modules/sync/SyncController.ts b/packages/transport/src/modules/sync/SyncController.ts
index e44399b53..9d3753e14 100644
--- a/packages/transport/src/modules/sync/SyncController.ts
+++ b/packages/transport/src/modules/sync/SyncController.ts
@@ -100,7 +100,9 @@ export class SyncController extends TransportController {
                 await this.syncDatawallet(changedItems).catch((e) => this.log.error(e));
             }
 
-            this.transport.eventBus.publish(new DatawalletSynchronizedEvent(this.parent.identity.address.toString()));
+            if (this.datawalletEnabled) {
+                this.transport.eventBus.publish(new DatawalletSynchronizedEvent(this.parent.identity.address.toString()));
+            }
         }
 
         return changedItems;