diff --git a/backend/v3/storage/database/repository/org.go b/backend/v3/storage/database/repository/org.go
index be2188bd40..e8053aadd9 100644
--- a/backend/v3/storage/database/repository/org.go
+++ b/backend/v3/storage/database/repository/org.go
@@ -224,9 +224,6 @@ func scanOrganization(ctx context.Context, querier database.Querier, builder *da
 
 	organization := &domain.Organization{}
 	if err := rows.(database.CollectableRows).CollectExactlyOneRow(organization); err != nil {
-		if err.Error() == "no rows in result set" {
-			return nil, ErrResourceDoesNotExist
-		}
 		return nil, err
 	}
 
@@ -241,12 +238,6 @@ func scanOrganizations(ctx context.Context, querier database.Querier, builder *d
 
 	organizations := []*domain.Organization{}
 	if err := rows.(database.CollectableRows).Collect(&organizations); err != nil {
-		// if no results returned, this is not a error
-		// it just means the organization was not found
-		// the caller should check if the returned organization is nil
-		if err.Error() == "no rows in result set" {
-			return nil, nil
-		}
 		return nil, err
 	}
 	return organizations, nil