diff --git a/internal/api/grpc/object/v2beta/converter.go b/internal/api/grpc/object/v2beta/converter.go
index 0b6c658f9b..79de077b86 100644
--- a/internal/api/grpc/object/v2beta/converter.go
+++ b/internal/api/grpc/object/v2beta/converter.go
@@ -114,6 +114,9 @@ func DomainValidationTypeFromModel(validationType domain.OrgDomainValidationType
 		return org_pb.DomainValidationType_DOMAIN_VALIDATION_TYPE_DNS
 	case domain.OrgDomainValidationTypeHTTP:
 		return org_pb.DomainValidationType_DOMAIN_VALIDATION_TYPE_HTTP
+	case domain.OrgDomainValidationTypeUnspecified:
+		// added to please golangci-lint
+		return org_pb.DomainValidationType_DOMAIN_VALIDATION_TYPE_UNSPECIFIED
 	default:
 		return org_pb.DomainValidationType_DOMAIN_VALIDATION_TYPE_UNSPECIFIED
 	}
@@ -155,6 +158,9 @@ func DomainValidationTypeToDomain(validationType org_pb.DomainValidationType) do
 		return domain.OrgDomainValidationTypeHTTP
 	case org_pb.DomainValidationType_DOMAIN_VALIDATION_TYPE_DNS:
 		return domain.OrgDomainValidationTypeDNS
+	case org_pb.DomainValidationType_DOMAIN_VALIDATION_TYPE_UNSPECIFIED:
+		// added to please golangci-lint
+		return domain.OrgDomainValidationTypeUnspecified
 	default:
 		return domain.OrgDomainValidationTypeUnspecified
 	}
diff --git a/internal/api/grpc/org/v2beta/helper.go b/internal/api/grpc/org/v2beta/helper.go
index 388fb4e28b..b2b47754f9 100644
--- a/internal/api/grpc/org/v2beta/helper.go
+++ b/internal/api/grpc/org/v2beta/helper.go
@@ -57,6 +57,12 @@ func OrgStateToPb(state domain.OrgState) v2beta_org.OrgState {
 		return v2beta_org.OrgState_ORG_STATE_ACTIVE
 	case domain.OrgStateInactive:
 		return v2beta_org.OrgState_ORG_STATE_INACTIVE
+	case domain.OrgStateRemoved:
+		// added to please golangci-lint
+		return v2beta_org.OrgState_ORG_STATE_REMOVED
+	case domain.OrgStateUnspecified:
+		// added to please golangci-lint
+		return v2beta_org.OrgState_ORG_STATE_UNSPECIFIED
 	default:
 		return v2beta_org.OrgState_ORG_STATE_UNSPECIFIED
 	}
@@ -118,6 +124,9 @@ func OrgStateToDomain(state v2beta_org.OrgState) domain.OrgState {
 		return domain.OrgStateActive
 	case v2beta_org.OrgState_ORG_STATE_INACTIVE:
 		return domain.OrgStateInactive
+	case v2beta_org.OrgState_ORG_STATE_REMOVED:
+		// added to please golangci-lint
+		return domain.OrgStateRemoved
 	case v2beta_org.OrgState_ORG_STATE_UNSPECIFIED:
 		fallthrough
 	default: