diff --git a/pkg/infrastructure/repository/environment.go b/pkg/infrastructure/repository/environment.go
index 6b0912d9..5cbaaf3a 100644
--- a/pkg/infrastructure/repository/environment.go
+++ b/pkg/infrastructure/repository/environment.go
@@ -44,17 +44,13 @@ func (r *environmentRepository) GetEnv(ctx context.Context, cond domain.GetEnvCo
 	return ds.Map(environments, repoconvert.ToDomainEnvironment), nil
 }
 
-func (r *environmentRepository) SetEnv(ctx context.Context, env *domain.Environment) (err error) {
+func (r *environmentRepository) SetEnv(ctx context.Context, env *domain.Environment) error {
 	// NOTE: sqlboiler does not recognize multiple column unique keys: https://github.com/volatiletech/sqlboiler/issues/328
 	tx, err := r.db.BeginTx(ctx, nil)
 	if err != nil {
 		return errors.Wrap(err, "failed to start transaction")
 	}
-	defer func() {
-		if err != nil {
-			tx.Rollback()
-		}
-	}()
+	defer tx.Rollback()
 
 	_, err = models.Applications(
 		qm.Select(models.ApplicationColumns.ID),