diff --git a/managed/models/database.go b/managed/models/database.go
index 9e87277916..d3ac372905 100644
--- a/managed/models/database.go
+++ b/managed/models/database.go
@@ -1177,7 +1177,7 @@ func SetupDB(ctx context.Context, sqlDB *sql.DB, params SetupDBParams) (*reform.
 
 // EncryptDB encrypts a set of columns in a specific database and table.
 func EncryptDB(tx *reform.TX, database string, itemsToEncrypt []encryption.Table) error {
-	return dbEncryption(tx, database, itemsToEncrypt, encryption.EncryptItems, encryptionExists, addToEncryptedItems)
+	return dbEncryption(tx, database, itemsToEncrypt, encryption.EncryptItems, true, addToEncryptedItems)
 }
 
 func encryptionExists(m map[string]bool, key string) bool {
@@ -1190,7 +1190,7 @@ func addToEncryptedItems(encryptedItems []string, items []string) []string {
 
 // DecryptDB decrypts a set of columns in a specific database and table.
 func DecryptDB(tx *reform.TX, database string, itemsToEncrypt []encryption.Table) error {
-	return dbEncryption(tx, database, itemsToEncrypt, encryption.DecryptItems, encryptionNotExists, removeFromEncryptedItems)
+	return dbEncryption(tx, database, itemsToEncrypt, encryption.DecryptItems, false, removeFromEncryptedItems)
 }
 
 func encryptionNotExists(m map[string]bool, key string) bool {
@@ -1219,7 +1219,7 @@ func removeFromEncryptedItems(encryptedItems []string, items []string) []string
 
 func dbEncryption(tx *reform.TX, database string, items []encryption.Table,
 	encryptionHandler func(tx *reform.TX, tables []encryption.Table) error,
-	checkHandler func(m map[string]bool, key string) bool,
+	expectedState bool,
 	settingsHandler func(encryptedItems []string, items []string) []string,
 ) error {
 	if len(items) == 0 {
@@ -1241,7 +1241,7 @@ func dbEncryption(tx *reform.TX, database string, items []encryption.Table,
 		columns := []encryption.Column{}
 		for _, column := range table.Columns {
 			dbTableColumn := fmt.Sprintf("%s.%s.%s", database, table.Name, column.Name)
-			if checkHandler(currentColumns, dbTableColumn) {
+			if currentColumns[dbTableColumn] == expectedState {
 				continue
 			}