diff --git a/backend/v3/storage/database/repository/org_test.go b/backend/v3/storage/database/repository/org_test.go
index a6b5182f8c..74d72c9e59 100644
--- a/backend/v3/storage/database/repository/org_test.go
+++ b/backend/v3/storage/database/repository/org_test.go
@@ -45,7 +45,7 @@ func TestCreateOrganization(t *testing.T) {
 					ID:         organizationId,
 					Name:       organizationName,
 					InstanceID: instanceId,
-					State:      domain.OrgStateActive.String(),
+					State:      domain.OrgStateActive,
 				}
 				return organization
 			}(),
@@ -59,7 +59,7 @@ func TestCreateOrganization(t *testing.T) {
 					ID:         organizationId,
 					Name:       "",
 					InstanceID: instanceId,
-					State:      domain.OrgStateActive.String(),
+					State:      domain.OrgStateActive,
 				}
 				return organization
 			}(),
@@ -76,7 +76,7 @@ func TestCreateOrganization(t *testing.T) {
 					ID:         organizationId,
 					Name:       organizationName,
 					InstanceID: instanceId,
-					State:      domain.OrgStateActive.String(),
+					State:      domain.OrgStateActive,
 				}
 
 				err := organizationRepo.Create(ctx, &org)
@@ -98,7 +98,7 @@ func TestCreateOrganization(t *testing.T) {
 					ID:         organizationId,
 					Name:       organizationName,
 					InstanceID: instanceId,
-					State:      domain.OrgStateActive.String(),
+					State:      domain.OrgStateActive,
 				}
 
 				err := organizationRepo.Create(ctx, &org)
@@ -147,7 +147,7 @@ func TestCreateOrganization(t *testing.T) {
 						ID:         gofakeit.Name(),
 						Name:       organizationName,
 						InstanceID: instId,
-						State:      domain.OrgStateActive.String(),
+						State:      domain.OrgStateActive,
 					}
 
 					err = organizationRepo.Create(ctx, &org)
@@ -163,7 +163,7 @@ func TestCreateOrganization(t *testing.T) {
 					ID:         orgID,
 					Name:       organizationName,
 					InstanceID: instanceId,
-					State:      domain.OrgStateActive.String(),
+					State:      domain.OrgStateActive,
 				},
 			}
 		}(),
@@ -176,7 +176,7 @@ func TestCreateOrganization(t *testing.T) {
 					// ID:              organizationId,
 					Name:       organizationName,
 					InstanceID: instanceId,
-					State:      domain.OrgStateActive.String(),
+					State:      domain.OrgStateActive,
 				}
 				return organization
 			}(),
@@ -190,7 +190,7 @@ func TestCreateOrganization(t *testing.T) {
 				organization := domain.Organization{
 					ID:    organizationId,
 					Name:  organizationName,
-					State: domain.OrgStateActive.String(),
+					State: domain.OrgStateActive,
 				}
 				return organization
 			}(),
@@ -205,7 +205,7 @@ func TestCreateOrganization(t *testing.T) {
 					ID:         organizationId,
 					Name:       organizationName,
 					InstanceID: gofakeit.Name(),
-					State:      domain.OrgStateActive.String(),
+					State:      domain.OrgStateActive,
 				}
 				return organization
 			}(),
@@ -283,7 +283,7 @@ func TestUpdateOrganization(t *testing.T) {
 					ID:         organizationId,
 					Name:       organizationName,
 					InstanceID: instanceId,
-					State:      domain.OrgStateActive.String(),
+					State:      domain.OrgStateActive,
 				}
 
 				// create organization
@@ -307,7 +307,7 @@ func TestUpdateOrganization(t *testing.T) {
 					ID:         organizationId,
 					Name:       organizationName,
 					InstanceID: instanceId,
-					State:      domain.OrgStateActive.String(),
+					State:      domain.OrgStateActive,
 				}
 
 				// create organization
@@ -336,7 +336,7 @@ func TestUpdateOrganization(t *testing.T) {
 					ID:         organizationId,
 					Name:       organizationName,
 					InstanceID: instanceId,
-					State:      domain.OrgStateActive.String(),
+					State:      domain.OrgStateActive,
 				}
 
 				// create organization
@@ -344,7 +344,7 @@ func TestUpdateOrganization(t *testing.T) {
 				require.NoError(t, err)
 
 				// update with updated value
-				org.State = domain.OrgStateInactive.String()
+				org.State = domain.OrgStateInactive
 				return &org
 			},
 			update:       []database.Change{organizationRepo.SetState(domain.OrgStateInactive)},
@@ -427,7 +427,7 @@ func TestGetOrganization(t *testing.T) {
 		ID:         gofakeit.Name(),
 		Name:       gofakeit.Name(),
 		InstanceID: instanceId,
-		State:      domain.OrgStateActive.String(),
+		State:      domain.OrgStateActive,
 	}
 	err = orgRepo.Create(t.Context(), &org)
 	require.NoError(t, err)
@@ -451,7 +451,7 @@ func TestGetOrganization(t *testing.T) {
 						ID:         organizationId,
 						Name:       organizationName,
 						InstanceID: instanceId,
-						State:      domain.OrgStateActive.String(),
+						State:      domain.OrgStateActive,
 					}
 
 					// create organization
@@ -474,7 +474,7 @@ func TestGetOrganization(t *testing.T) {
 						ID:         organizationId,
 						Name:       organizationName,
 						InstanceID: instanceId,
-						State:      domain.OrgStateActive.String(),
+						State:      domain.OrgStateActive,
 					}
 
 					// create organization
@@ -572,7 +572,7 @@ func TestListOrganization(t *testing.T) {
 						ID:         gofakeit.Name(),
 						Name:       gofakeit.Name(),
 						InstanceID: instanceId,
-						State:      domain.OrgStateActive.String(),
+						State:      domain.OrgStateActive,
 					}
 
 					// create organization
@@ -596,7 +596,7 @@ func TestListOrganization(t *testing.T) {
 						ID:         gofakeit.Name(),
 						Name:       gofakeit.Name(),
 						InstanceID: instanceId,
-						State:      domain.OrgStateActive.String(),
+						State:      domain.OrgStateActive,
 					}
 
 					// create organization
@@ -621,7 +621,7 @@ func TestListOrganization(t *testing.T) {
 						ID:         gofakeit.Name(),
 						Name:       gofakeit.Name(),
 						InstanceID: instanceId,
-						State:      domain.OrgStateActive.String(),
+						State:      domain.OrgStateActive,
 					}
 					err = organizationRepo.Create(ctx, &org)
 					require.NoError(t, err)
@@ -634,7 +634,7 @@ func TestListOrganization(t *testing.T) {
 							ID:         organizationId,
 							Name:       gofakeit.Name(),
 							InstanceID: instanceId,
-							State:      domain.OrgStateActive.String(),
+							State:      domain.OrgStateActive,
 						}
 
 						// create organization
@@ -659,7 +659,7 @@ func TestListOrganization(t *testing.T) {
 					ID:         gofakeit.Name(),
 					Name:       gofakeit.Name(),
 					InstanceID: instanceId,
-					State:      domain.OrgStateActive.String(),
+					State:      domain.OrgStateActive,
 				}
 				err = organizationRepo.Create(ctx, &org)
 				require.NoError(t, err)
@@ -672,7 +672,7 @@ func TestListOrganization(t *testing.T) {
 						ID:         gofakeit.Name(),
 						Name:       gofakeit.Name(),
 						InstanceID: instanceId,
-						State:      domain.OrgStateInactive.String(),
+						State:      domain.OrgStateInactive,
 					}
 
 					// create organization
@@ -713,7 +713,7 @@ func TestListOrganization(t *testing.T) {
 						ID:         gofakeit.Name(),
 						Name:       gofakeit.Name(),
 						InstanceID: instanceId_1,
-						State:      domain.OrgStateActive.String(),
+						State:      domain.OrgStateActive,
 					}
 					err = organizationRepo.Create(ctx, &org)
 					require.NoError(t, err)
@@ -739,7 +739,7 @@ func TestListOrganization(t *testing.T) {
 							ID:         gofakeit.Name(),
 							Name:       gofakeit.Name(),
 							InstanceID: instanceId_2,
-							State:      domain.OrgStateActive.String(),
+							State:      domain.OrgStateActive,
 						}
 
 						// create organization
@@ -822,7 +822,7 @@ func TestDeleteOrganization(t *testing.T) {
 							ID:         organizationId,
 							Name:       gofakeit.Name(),
 							InstanceID: instanceId,
-							State:      domain.OrgStateActive.String(),
+							State:      domain.OrgStateActive,
 						}
 
 						// create organization
@@ -850,7 +850,7 @@ func TestDeleteOrganization(t *testing.T) {
 							ID:         gofakeit.Name(),
 							Name:       organizationName,
 							InstanceID: instanceId,
-							State:      domain.OrgStateActive.String(),
+							State:      domain.OrgStateActive,
 						}
 
 						// create organization
@@ -886,7 +886,7 @@ func TestDeleteOrganization(t *testing.T) {
 							ID:         gofakeit.Name(),
 							Name:       organizationName,
 							InstanceID: instanceId,
-							State:      domain.OrgStateActive.String(),
+							State:      domain.OrgStateActive,
 						}
 
 						// create organization
diff --git a/internal/query/projection/org_relational.go b/internal/query/projection/org_relational.go
index d708c69ea1..3cc469a4df 100644
--- a/internal/query/projection/org_relational.go
+++ b/internal/query/projection/org_relational.go
@@ -81,7 +81,7 @@ func (p *orgRelationalProjection) reduceOrgRelationalAdded(event eventstore.Even
 			handler.NewCol(OrgColumnID, e.Aggregate().ID),
 			handler.NewCol(OrgColumnName, e.Name),
 			handler.NewCol(OrgColumnInstanceID, e.Aggregate().InstanceID),
-			handler.NewCol(State, repoDomain.OrgStateActive.String()),
+			handler.NewCol(State, repoDomain.OrgStateActive),
 			handler.NewCol(CreatedAt, e.CreationDate()),
 			handler.NewCol(UpdatedAt, e.CreationDate()),
 		},
@@ -118,7 +118,7 @@ func (p *orgRelationalProjection) reduceOrgRelationalDeactivated(event eventstor
 	return handler.NewUpdateStatement(
 		e,
 		[]handler.Column{
-			handler.NewCol(State, repoDomain.OrgStateInactive.String()),
+			handler.NewCol(State, repoDomain.OrgStateInactive),
 			handler.NewCol(UpdatedAt, e.CreationDate()),
 		},
 		[]handler.Condition{
@@ -136,7 +136,7 @@ func (p *orgRelationalProjection) reduceOrgRelationalReactivated(event eventstor
 	return handler.NewUpdateStatement(
 		e,
 		[]handler.Column{
-			handler.NewCol(State, repoDomain.OrgStateActive.String()),
+			handler.NewCol(State, repoDomain.OrgStateActive),
 			handler.NewCol(UpdatedAt, e.CreationDate()),
 		},
 		[]handler.Condition{