diff --git a/internal/dbmanager/client.go b/internal/dbmanager/client.go
index a999e4d803..c189da5552 100644
--- a/internal/dbmanager/client.go
+++ b/internal/dbmanager/client.go
@@ -106,6 +106,7 @@ func (m *ManagedClient) CreateDatabase(ctx context.Context, req *CreateDatabaseR
 
 		conn, err := pgx.Connect(ctx, uri.String())
 		if err != nil {
+			pool.Exec(ctx, fmt.Sprintf(`DROP DATABASE "%s" IF EXISTS WITH (FORCE)`, name))
 			return nil, fmt.Errorf("connect %s: %s", name, err)
 		}
 		defer conn.Close(ctx)