diff --git a/internal/apikeys/service.go b/internal/apikeys/service.go
index 8568a5b..3de67d6 100644
--- a/internal/apikeys/service.go
+++ b/internal/apikeys/service.go
@@ -593,7 +593,7 @@ func (s *Service) UpdateAPIKey(ctx context.Context, userID, keyID string, req *t
 		return nil, fmt.Errorf("failed to start transaction: %w", err)
 	}
 	defer func() {
-		if err := tx.Rollback(); err != nil {
+		if err := tx.Rollback(); err != nil && err != sql.ErrTxDone {
 			log.Printf("Failed to rollback transaction: %v", err)
 		}
 	}()
@@ -709,7 +709,7 @@ func (s *Service) DeleteAPIKey(ctx context.Context, userID, keyID string) error
 		return fmt.Errorf("failed to start transaction: %w", err)
 	}
 	defer func() {
-		if err := tx.Rollback(); err != nil {
+		if err := tx.Rollback(); err != nil && err != sql.ErrTxDone {
 			log.Printf("Failed to rollback transaction: %v", err)
 		}
 	}()
diff --git a/internal/teams/handlers.go b/internal/teams/handlers.go
index e746270..aa4fe4f 100644
--- a/internal/teams/handlers.go
+++ b/internal/teams/handlers.go
@@ -187,7 +187,7 @@ func (h *Handler) createTeamWithAgents(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	defer func() {
-		if err := tx.Rollback(); err != nil {
+		if err := tx.Rollback(); err != nil && err != sql.ErrTxDone {
 			log.Printf("Failed to rollback transaction: %v", err)
 		}
 	}()
@@ -777,7 +777,7 @@ func (h *Handler) updateTeamContextForAllAgents(teamID, userID string, sharedCon
 		return fmt.Errorf("failed to start transaction: %w", err)
 	}
 	defer func() {
-		if err := tx.Rollback(); err != nil {
+		if err := tx.Rollback(); err != nil && err != sql.ErrTxDone {
 			log.Printf("Failed to rollback transaction: %v", err)
 		}
 	}()
diff --git a/internal/templates/service.go b/internal/templates/service.go
index cd1e096..8e6da91 100644
--- a/internal/templates/service.go
+++ b/internal/templates/service.go
@@ -60,7 +60,7 @@ func (ts *TemplateService) CreateTemplate(template *types.ExecutionTemplate, par
 		return nil, fmt.Errorf("failed to begin transaction: %w", err)
 	}
 	defer func() {
-		if err := tx.Rollback(); err != nil {
+		if err := tx.Rollback(); err != nil && err != sql.ErrTxDone {
 			log.Printf("Failed to rollback transaction: %v", err)
 		}
 	}()
@@ -420,7 +420,7 @@ func (ts *TemplateService) UpdateTemplate(_ string, template *types.ExecutionTem
 		return nil, nil, fmt.Errorf("failed to begin transaction: %w", err)
 	}
 	defer func() {
-		if err := tx.Rollback(); err != nil {
+		if err := tx.Rollback(); err != nil && err != sql.ErrTxDone {
 			log.Printf("Failed to rollback transaction: %v", err)
 		}
 	}()