diff --git a/plugin.json b/plugin.json
index ab5162a3..a2dfe94d 100644
--- a/plugin.json
+++ b/plugin.json
@@ -32,7 +32,7 @@
           "key": "EncryptionKey",
           "display_name": "At Rest Encryption Key:",
           "type": "generated",
-          "help_text": "The encryption key used to encrypt stored API tokens.",
+          "help_text": "The encryption key used to encrypt tokens.",
           "placeholder": "",
           "default": null,
           "secret": true
diff --git a/server/config/main.go b/server/config/main.go
index bc9b828b..e6d15e31 100644
--- a/server/config/main.go
+++ b/server/config/main.go
@@ -21,7 +21,7 @@ var (
 
 type Configuration struct {
 	Secret                      string `json:"secret"`
-	EncryptionKey               string `json:"encryptionKey"` // The encryption key used to encrypt stored api tokens
+	EncryptionKey               string `json:"encryptionKey"` // The encryption key used to encrypt tokens
 	AdminAPIToken               string `json:"adminAPIToken"` // API token from Confluence Data Center
 	ConfluenceOAuthClientID     string
 	ConfluenceOAuthClientSecret string
diff --git a/server/confluence_server.go b/server/confluence_server.go
index fb5b4e1f..c5578a5f 100644
--- a/server/confluence_server.go
+++ b/server/confluence_server.go
@@ -305,12 +305,7 @@ func (p *Plugin) MakeHTTPCallWithAPIToken(path string) ([]byte, int, error) {
 func (p *Plugin) SetAdminAPITokenRequestHeader(req *http.Request) error {
 	pluginConfig := config.GetConfig()
 
-	adminAPIToken, err := decrypt([]byte(pluginConfig.AdminAPIToken), []byte(pluginConfig.EncryptionKey))
-	if err != nil {
-		return err
-	}
-
-	req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", string(adminAPIToken)))
+	req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", pluginConfig.AdminAPIToken))
 	req.Header.Set("Accept", "application/json")
 
 	return nil
diff --git a/server/plugin.go b/server/plugin.go
index 6fc546c5..8bd22bf0 100644
--- a/server/plugin.go
+++ b/server/plugin.go
@@ -101,21 +101,6 @@ func (p *Plugin) OnConfigurationChange() error {
 		return err
 	}
 
-	if configuration.AdminAPIToken != "" {
-		encryptionKey := configuration.EncryptionKey
-		if encryptionKey == "" {
-			p.client.Log.Warn("Encryption key is required to encrypt admin API token")
-			return errors.New("failed to encrypt admin token. Encryption key is not generated")
-		}
-
-		encryptedAdminAPIToken, err := encrypt([]byte(configuration.AdminAPIToken), []byte(encryptionKey))
-		if err != nil {
-			p.client.Log.Warn("Error encrypting the admin API token", "error", err.Error())
-			return err
-		}
-		configuration.AdminAPIToken = string(encryptedAdminAPIToken)
-	}
-
 	if err := configuration.IsValid(); err != nil {
 		config.Mattermost.LogError("Error in Validating Configuration.", "Error", err.Error())
 		return err