diff --git a/internal/repository/deviceauth/device_auth.go b/internal/repository/deviceauth/device_auth.go
index b03f79740f..26b50f4ee9 100644
--- a/internal/repository/deviceauth/device_auth.go
+++ b/internal/repository/deviceauth/device_auth.go
@@ -17,7 +17,7 @@ const (
 )
 
 type AddedEvent struct {
-	*eventstore.BaseEvent
+	*eventstore.BaseEvent `json:"-"`
 
 	ClientID   string
 	DeviceCode string
@@ -56,7 +56,7 @@ func NewAddedEvent(
 }
 
 type ApprovedEvent struct {
-	*eventstore.BaseEvent
+	*eventstore.BaseEvent `json:"-"`
 
 	Subject string
 }
@@ -87,7 +87,8 @@ func NewApprovedEvent(
 }
 
 type CanceledEvent struct {
-	*eventstore.BaseEvent
+	*eventstore.BaseEvent `json:"-"`
+
 	Reason domain.DeviceAuthCanceled
 }
 
@@ -108,7 +109,7 @@ func NewCanceledEvent(ctx context.Context, aggregate *eventstore.Aggregate, reas
 }
 
 type RemovedEvent struct {
-	*eventstore.BaseEvent
+	*eventstore.BaseEvent `json:"-"`
 
 	ClientID   string
 	DeviceCode string
diff --git a/internal/repository/feature/feature.go b/internal/repository/feature/feature.go
index 4ce007d2bc..f0d4a1ae59 100644
--- a/internal/repository/feature/feature.go
+++ b/internal/repository/feature/feature.go
@@ -17,7 +17,7 @@ func EventTypeFromFeature(feature domain.Feature) eventstore.EventType {
 }
 
 type SetEvent[T SetEventType] struct {
-	*eventstore.BaseEvent
+	*eventstore.BaseEvent `json:"-"`
 
 	Value T
 }
diff --git a/internal/repository/flow/flow.go b/internal/repository/flow/flow.go
index 2bf0932ece..d0c6a20f0c 100644
--- a/internal/repository/flow/flow.go
+++ b/internal/repository/flow/flow.go
@@ -15,7 +15,7 @@ const (
 )
 
 type TriggerActionsSetEvent struct {
-	eventstore.BaseEvent
+	eventstore.BaseEvent `json:"-"`
 
 	FlowType    domain.FlowType    `json:"flowType"`
 	TriggerType domain.TriggerType `json:"triggerType"`
@@ -58,7 +58,7 @@ func TriggerActionsSetEventMapper(event eventstore.Event) (eventstore.Event, err
 }
 
 type TriggerActionsCascadeRemovedEvent struct {
-	eventstore.BaseEvent
+	eventstore.BaseEvent `json:"-"`
 
 	FlowType    domain.FlowType    `json:"flowType"`
 	TriggerType domain.TriggerType `json:"triggerType"`
@@ -99,7 +99,7 @@ func TriggerActionsCascadeRemovedEventMapper(event eventstore.Event) (eventstore
 }
 
 type FlowClearedEvent struct {
-	eventstore.BaseEvent
+	eventstore.BaseEvent `json:"-"`
 
 	FlowType domain.FlowType `json:"flowType"`
 }
diff --git a/internal/repository/policy/policy_login_identity_provider.go b/internal/repository/policy/policy_login_identity_provider.go
index 59772190f7..2b5ff578cf 100644
--- a/internal/repository/policy/policy_login_identity_provider.go
+++ b/internal/repository/policy/policy_login_identity_provider.go
@@ -14,7 +14,7 @@ const (
 )
 
 type IdentityProviderAddedEvent struct {
-	eventstore.BaseEvent
+	eventstore.BaseEvent `json:"-"`
 
 	IDPConfigID     string                      `json:"idpConfigId,omitempty"`
 	IDPProviderType domain.IdentityProviderType `json:"idpProviderType,omitempty"`
@@ -55,7 +55,7 @@ func IdentityProviderAddedEventMapper(event eventstore.Event) (eventstore.Event,
 }
 
 type IdentityProviderRemovedEvent struct {
-	eventstore.BaseEvent
+	eventstore.BaseEvent `json:"-"`
 
 	IDPConfigID string `json:"idpConfigId"`
 }
@@ -92,7 +92,7 @@ func IdentityProviderRemovedEventMapper(event eventstore.Event) (eventstore.Even
 }
 
 type IdentityProviderCascadeRemovedEvent struct {
-	eventstore.BaseEvent
+	eventstore.BaseEvent `json:"-"`
 
 	IDPConfigID string `json:"idpConfigId"`
 }