From da95d40e33385c1746e5e87aea77af0c3ecb0d8e Mon Sep 17 00:00:00 2001
From: Farhan Munshi <3207297+fmunshi@users.noreply.github.com>
Date: Fri, 10 Jul 2020 00:09:00 -0400
Subject: [PATCH] Always clear channel cache when scheme is deleted (#14989)

---
 store/sqlstore/scheme_store.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/store/sqlstore/scheme_store.go b/store/sqlstore/scheme_store.go
index 45b854b1f7..3f7e4756e9 100644
--- a/store/sqlstore/scheme_store.go
+++ b/store/sqlstore/scheme_store.go
@@ -287,11 +287,11 @@ func (s *SqlSchemeStore) Delete(schemeId string) (*model.Scheme, error) {
 		if _, err := s.GetMaster().Exec("UPDATE Channels SET SchemeId = '' WHERE SchemeId = :SchemeId", map[string]interface{}{"SchemeId": schemeId}); err != nil {
 			return nil, errors.Wrapf(err, "failed to update Channels with schemeId=%s", schemeId)
 		}
-
-		// Blow away the channel caches.
-		s.Channel().ClearCaches()
 	}
 
+	// Blow away the channel caches.
+	s.Channel().ClearCaches()
+
 	// Delete the roles belonging to the scheme.
 	roleNames := []string{scheme.DefaultChannelGuestRole, scheme.DefaultChannelUserRole, scheme.DefaultChannelAdminRole}
 	if scheme.Scope == model.SCHEME_SCOPE_TEAM {