diff --git a/.distignore b/.distignore
index 4eb6476a..45fc7d69 100644
--- a/.distignore
+++ b/.distignore
@@ -9,11 +9,7 @@
 # DO NOT EXCLUDE /vendor
 
 # Files
-.babelrc
-.distignore
-.eslintignore
-.eslintrc.json
-.gitignore
+.*
 CHANGELOG.md
 CODE_OF_CONDUCT.md
 composer.json
@@ -28,5 +24,3 @@ phpunit.xml
 README.md
 webpack.config.js
 webpack.gutenberg.config.js
-.wp-env.json
-.nvmrc
diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml
index 86a59515..28449559 100644
--- a/.github/workflows/cypress.yml
+++ b/.github/workflows/cypress.yml
@@ -8,10 +8,6 @@ on:
   pull_request:
     branches:
       - develop
-    paths:
-      - '**.js'
-      - '**.php'
-      - '**.css'
 
 jobs:
   build:
diff --git a/.github/workflows/wordpress-latest.yml b/.github/workflows/wordpress-version-checker.yml
similarity index 80%
rename from .github/workflows/wordpress-latest.yml
rename to .github/workflows/wordpress-version-checker.yml
index b134ea59..34e44107 100644
--- a/.github/workflows/wordpress-latest.yml
+++ b/.github/workflows/wordpress-version-checker.yml
@@ -10,11 +10,14 @@ on:
   schedule:
     - cron: '0 0 * * 1'
 
+permissions:
+  issues: write
+
 jobs:
   wordpress-version-checker:
     runs-on: ubuntu-latest
     steps:
       - name: WordPress version checker
-        uses: skaut/wordpress-version-checker@v1.2.0
+        uses: skaut/wordpress-version-checker@master
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.wordpress-version-checker.json b/.wordpress-version-checker.json
new file mode 100644
index 00000000..b20af627
--- /dev/null
+++ b/.wordpress-version-checker.json
@@ -0,0 +1,3 @@
+{
+    "channel": "rc"
+}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 05491f0e..f5f36c06 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,23 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased] - TBD
 
-## [2.1.0] - 2023-07-05
+## [2.1.1] - 2023-08-XX
+
+### Changed
+- Improved setup instructions and error handing (props [@johnwatkins0](https://github.com/johnwatkins0), [@iamdharmesh](https://github.com/iamdharmesh), [@jeffpaul](https://github.com/jeffpaul) via [#255](https://github.com/10up/autoshare-for-twitter/pull/255)).
+- Bump WordPress "tested up to" version 6.3 (props [@iamdharmesh](https://github.com/iamdharmesh), [@jeffpaul](https://github.com/jeffpaul) via [#265](https://github.com/10up/autoshare-for-twitter/pull/265)).
+
+### Fixed
+- The custom tweet message does not work with scheduled posts (props [@GeoffLambert77](https://github.com/GeoffLambert77), [@iamdharmesh](https://github.com/iamdharmesh), [@Sidsector9](https://github.com/Sidsector9) via [#267](https://github.com/10up/autoshare-for-twitter/pull/267)).
+- Connected Twitter accounts visibility in the classic editor (props [@iamdharmesh](https://github.com/iamdharmesh), [@Sidsector9](https://github.com/Sidsector9) via [#269](https://github.com/10up/autoshare-for-twitter/pull/269)).
+- Better error handling for environments that don't match our minimum PHP version (props [@dkotter](https://github.com/dkotter), [@rahulsprajapati](https://github.com/rahulsprajapati), [@iamdharmesh](https://github.com/iamdharmesh) via [#258](https://github.com/10up/autoshare-for-twitter/pull/258)).
+- Ensure our E2E tests work properly on WordPress 6.3 (props [@iamdharmesh](https://github.com/iamdharmesh), [@dkotter](https://github.com/dkotter) via [#264](https://github.com/10up/autoshare-for-twitter/pull/264)).
+
+### Security
+- Bump `tough-cookie` from 2.5.0 to 4.1.3 and `@cypress/request` from 2.88.10 to 2.88.12 (props [@dependabot[bot]](https://github.com/apps/dependabot), [@iamdharmesh](https://github.com/iamdharmesh) via [#266](https://github.com/10up/autoshare-for-twitter/pull/266)).
+- Bump `word-wrap` from 1.2.3 to 1.2.4 (props [@dependabot[bot]](https://github.com/apps/dependabot), [@iamdharmesh](https://github.com/iamdharmesh) via [#257](https://github.com/10up/autoshare-for-twitter/pull/257)).
+
+## [2.1.0] - 2023-07-06
 ### Added
 - Support for tweeting via multiple Twitter accounts (props [@iamdharmesh](https://github.com/iamdharmesh), [@jeffpaul](https://github.com/jeffpaul), [@Sidsector9](https://github.com/Sidsector9) via [#238](https://github.com/10up/autoshare-for-twitter/pull/238)).
 - Obfuscation of saved Twitter keys in the UI (props [@lgrzegorski](https://github.com/lgrzegorski), [@bmarshall511](https://github.com/bmarshall511), [@iamdharmesh](https://github.com/iamdharmesh) via [#245](https://github.com/10up/autoshare-for-twitter/pull/245)).
@@ -210,6 +226,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Initial closed source release (props [@scottlee](https://github.com/scottlee/)).
 
 [Unreleased]: https://github.com/10up/autoshare-for-twitter/compare/trunk...develop
+[2.1.1]: https://github.com/10up/autoshare-for-twitter/compare/2.1.0...2.1.1
 [2.1.0]: https://github.com/10up/autoshare-for-twitter/compare/2.0.0...2.1.0
 [2.0.0]: https://github.com/10up/autoshare-for-twitter/compare/1.3.0...2.0.0
 [1.3.0]: https://github.com/10up/autoshare-for-twitter/compare/1.2.1...1.3.0
diff --git a/CREDITS.md b/CREDITS.md
index d75a654f..edac58f5 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -10,7 +10,7 @@ The following individuals are responsible for curating the list of issues, respo
 
 Thank you to all the people who have already contributed to this repository via bug reports, code, design, ideas, project management, translation, testing, etc.
 
-[Adam Silverstein (@adamsilverstein)](https://github.com/adamsilverstein), [John Watkins (@johnwatkins0)](https://github.com/johnwatkins0), [Scott Lee (@scottlee)](https://github.com/scottlee), [Jeffrey Paul (@jeffpaul)](https://github.com/jeffpaul), [Stephanie Campbell (@sncampbell)](https://github.com/sncampbell), [Ryan Welcher (@ryanwelcher)](https://github.com/ryanwelcher), [Ricky Lee Whittemore (@rickalee)](https://github.com/rickalee), [Tung Du (@dinhtungdu)](https://github.com/dinhtungdu), [Lina Wiezkowiak (@linawiezkowiak)](https://github.com/linawiezkowiak), [Oszkar Nagy (@oszkarnagy)](https://github.com/oszkarnagy), [Helen Hou-Sandi (@helen)](https://github.com/helen), [Thrijith Thankachan (@thrijith)](https://github.com/thrijith), [Barney Jeffries (@barneyjeffries)](https://github.com/barneyjeffries), [Darin Kotter (@dkotter)](https://github.com/dkotter), [Siddharth Thevaril (@Sidsector9)](https://github.com/Sidsector9), [Dharmesh Patel (@iamdharmesh)](https://github.com/iamdharmesh), [Faisal Alvi (@faisal-alvi)](https://github.com/faisal-alvi), [Sudip Dadhaniya (@sudip-10up)](https://github.com/sudip-10up), [Peter Wilson (@peterwilsoncc)](https://github.com/peterwilsoncc), [Max Lyuchin (@cadic)](https://github.com/cadic), [Vikram Moparthy (@vikrampm1)](https://github.com/vikrampm1), [GitHub Dependabot (@dependabot)](https://github.com/apps/dependabot), [Ravinder Kumar (@ravinderk)](https://github.com/ravinderk), [Lukasz Grzegorski (@lgrzegorski)](https://github.com/lgrzegorski), [Ben Marshall (@bmarshall511)](https://github.com/bmarshall511), [Miguel Estrada (@mae829)](https://github.com/mae829).
+[Adam Silverstein (@adamsilverstein)](https://github.com/adamsilverstein), [John Watkins (@johnwatkins0)](https://github.com/johnwatkins0), [Scott Lee (@scottlee)](https://github.com/scottlee), [Jeffrey Paul (@jeffpaul)](https://github.com/jeffpaul), [Stephanie Campbell (@sncampbell)](https://github.com/sncampbell), [Ryan Welcher (@ryanwelcher)](https://github.com/ryanwelcher), [Ricky Lee Whittemore (@rickalee)](https://github.com/rickalee), [Tung Du (@dinhtungdu)](https://github.com/dinhtungdu), [Lina Wiezkowiak (@linawiezkowiak)](https://github.com/linawiezkowiak), [Oszkar Nagy (@oszkarnagy)](https://github.com/oszkarnagy), [Helen Hou-Sandi (@helen)](https://github.com/helen), [Thrijith Thankachan (@thrijith)](https://github.com/thrijith), [Barney Jeffries (@barneyjeffries)](https://github.com/barneyjeffries), [Darin Kotter (@dkotter)](https://github.com/dkotter), [Siddharth Thevaril (@Sidsector9)](https://github.com/Sidsector9), [Dharmesh Patel (@iamdharmesh)](https://github.com/iamdharmesh), [Faisal Alvi (@faisal-alvi)](https://github.com/faisal-alvi), [Sudip Dadhaniya (@sudip-10up)](https://github.com/sudip-10up), [Peter Wilson (@peterwilsoncc)](https://github.com/peterwilsoncc), [Max Lyuchin (@cadic)](https://github.com/cadic), [Vikram Moparthy (@vikrampm1)](https://github.com/vikrampm1), [GitHub Dependabot (@dependabot)](https://github.com/apps/dependabot), [Ravinder Kumar (@ravinderk)](https://github.com/ravinderk), [Lukasz Grzegorski (@lgrzegorski)](https://github.com/lgrzegorski), [Ben Marshall (@bmarshall511)](https://github.com/bmarshall511), [Miguel Estrada (@mae829)](https://github.com/mae829), [Rahul Prajapati (@rahulsprajapati)](https://github.com/rahulsprajapati), [@GeoffLambert77](https://github.com/GeoffLambert77).
 
 ## Libraries
 
diff --git a/assets/js/admin-autoshare-for-twitter-classic-editor.js b/assets/js/admin-autoshare-for-twitter-classic-editor.js
index cbf5ad2f..cb7843c3 100644
--- a/assets/js/admin-autoshare-for-twitter-classic-editor.js
+++ b/assets/js/admin-autoshare-for-twitter-classic-editor.js
@@ -238,6 +238,9 @@
 				( ( response.success && response.data.message ) || ( false === response.success && false === response.data.is_retweeted) )
 			) {
 				$('.autoshare-for-twitter-status-logs-wrapper').html(response.data.message);
+				if ( response.data.is_retweeted ) {
+					$tweetText.val(''); // Reset the tweet text.
+				}
 			} else {
 				$("#autoshare-for-twitter-error-message").html(adminAutoshareForTwitter.unknownErrorText);
 			}
diff --git a/autoshare-for-twitter.php b/autoshare-for-twitter.php
index ee8c4e84..ca4fa110 100644
--- a/autoshare-for-twitter.php
+++ b/autoshare-for-twitter.php
@@ -3,7 +3,7 @@
  * Plugin Name:       Autoshare for Twitter
  * Description:       Automatically tweets the post title or custom message and a link to the post.
  * Disclaimer:        TWITTER, TWEET, RETWEET and the Twitter logo are trademarks of Twitter, Inc. or its affiliates.
- * Version:           2.1.0
+ * Version:           2.1.1
  * Requires at least: 5.7
  * Requires PHP:      7.4
  * Author:            10up
@@ -15,16 +15,61 @@
  * @package TenUp\AutoshareForTwitter
  */
 
+namespace TenUp\AutoshareForTwitter;
+
 if ( ! defined( 'ABSPATH' ) ) {
 	exit; // Exit if accessed directly.
 }
 
 define( 'AUTOSHARE_FOR_TWITTER', __FILE__ );
-define( 'AUTOSHARE_FOR_TWITTER_VERSION', '2.1.0' );
+define( 'AUTOSHARE_FOR_TWITTER_VERSION', '2.1.1' );
 define( 'AUTOSHARE_FOR_TWITTER_URL', plugin_dir_url( __FILE__ ) );
 define( 'AUTOSHARE_FOR_TWITTER_PATH', plugin_dir_path( __FILE__ ) );
 define( 'AUTOSHARE_FOR_TWITTER_INC', AUTOSHARE_FOR_TWITTER_PATH . 'includes/' );
 
+/**
+ * Get the minimum version of PHP required by this plugin.
+ *
+ * @return string Minimum version required.
+ */
+function minimum_php_requirement() {
+	return '7.4';
+}
+
+/**
+ * Whether PHP installation meets the minimum requirements
+ *
+ * @return bool True if meets minimum requirements, false otherwise.
+ */
+function site_meets_php_requirements() {
+	return version_compare( phpversion(), minimum_php_requirement(), '>=' );
+}
+
+// Ensuring our PHP version requirement is met first before loading plugin.
+if ( ! site_meets_php_requirements() ) {
+	add_action(
+		'admin_notices',
+		function() {
+			?>
+			<div class="notice notice-error">
+				<p>
+					<?php
+					echo wp_kses_post(
+						sprintf(
+							/* translators: %s: Minimum required PHP version */
+							__( 'Autoshare for Twitter requires PHP version %s or later. Please upgrade PHP or disable the plugin.', 'autoshare-for-twitter' ),
+							esc_html( minimum_php_requirement() )
+						)
+					);
+					?>
+				</p>
+			</div>
+			<?php
+		}
+	);
+	return;
+}
+
 /**
  * Composer check.
  */
diff --git a/composer.json b/composer.json
index 75e9b7b6..69b512ef 100644
--- a/composer.json
+++ b/composer.json
@@ -32,7 +32,7 @@
 		"platform": {
 			"php": "7.4"
 		},
-		"autoloader-suffix": "10upAutoshareForTwitterV210",
+		"autoloader-suffix": "10upAutoshareForTwitterV211",
 		"allow-plugins": {
 			"dealerdirect/phpcodesniffer-composer-installer": true
 		}
diff --git a/includes/admin/assets.php b/includes/admin/assets.php
index 715e7605..b77147f0 100644
--- a/includes/admin/assets.php
+++ b/includes/admin/assets.php
@@ -206,6 +206,7 @@ function localize_data( $handle = SCRIPT_HANDLE ) {
 	$status_meta    = get_autoshare_for_twitter_meta( $post_id, TWITTER_STATUS_KEY );
 	$accounts       = ( new Twitter_Accounts() )->get_twitter_accounts( true );
 	$tweet_accounts = get_tweet_accounts( $post_id );
+	$tweet_body     = trim( get_autoshare_for_twitter_meta( $post_id, TWEET_BODY_KEY ) );
 	if ( empty( $tweet_accounts ) ) {
 		$tweet_accounts = get_default_autoshare_accounts();
 	}
@@ -217,6 +218,7 @@ function localize_data( $handle = SCRIPT_HANDLE ) {
 		'nonce'              => wp_create_nonce( 'wp_rest' ),
 		'restUrl'            => rest_url( post_autoshare_for_twitter_meta_rest_route( $post_id ) ),
 		'tweetBodyKey'       => TWEET_BODY_KEY,
+		'customTweetBody'    => $tweet_body,
 		'status'             => $status_meta && is_array( $status_meta ) ? $status_meta : null,
 		'unknownErrorText'   => __( 'An unknown error occurred', 'autoshare-for-twitter' ),
 		'siteUrl'            => home_url(),
diff --git a/includes/admin/post-meta.php b/includes/admin/post-meta.php
index bfa73655..0f1f4d58 100644
--- a/includes/admin/post-meta.php
+++ b/includes/admin/post-meta.php
@@ -156,7 +156,7 @@ function save_autoshare_for_twitter_meta_data( $post_id, $data ) {
 	// If the enable key is not set, set it to the default setting value.
 	if ( ! array_key_exists( ENABLE_AUTOSHARE_FOR_TWITTER_KEY, $data ) ) {
 		// phpcs:ignore WordPress.Security.NonceVerification.Missing
-		if ( isset( $_POST['classic-editor'] ) ) {
+		if ( isset( $_POST['autoshare-classic-editor'] ) ) {
 			// Handle unchecked "Tweet this post" checkbox for classic editor.
 			$data[ ENABLE_AUTOSHARE_FOR_TWITTER_KEY ] = 0;
 		} else {
@@ -166,7 +166,7 @@ function save_autoshare_for_twitter_meta_data( $post_id, $data ) {
 
 	if ( ! array_key_exists( TWEET_ALLOW_IMAGE, $data ) ) {
 		// phpcs:ignore WordPress.Security.NonceVerification.Missing
-		if ( isset( $_POST['classic-editor'] ) ) {
+		if ( isset( $_POST['autoshare-classic-editor'] ) ) {
 			// Handle unchecked "Tweet this post" checkbox for classic editor.
 			$data[ TWEET_ALLOW_IMAGE ] = 0;
 		} else {
@@ -293,8 +293,9 @@ function render_twitter_accounts( $post_id ) {
 	if ( empty( $enabled ) ) {
 		$enabled = Utils\get_default_autoshare_accounts();
 	}
+	$display = ( autoshare_enabled( $post_id ) ) ? '' : 'display: none;';
 	?>
-	<div class="autoshare-for-twitter-accounts-wrapper">
+	<div class="autoshare-for-twitter-accounts-wrapper" style="<?php echo esc_attr( $display ); ?>">
 		<?php
 		foreach ( $accounts as $account ) {
 			?>
@@ -546,6 +547,8 @@ function markup_unknown( $status_meta ) {
  * @return string
  */
 function _safe_markup_default() {
+	$custom_tweet_body = Utils\get_autoshare_for_twitter_meta( get_the_ID(), TWEET_BODY_KEY );
+
 	$count      = ( strlen( get_permalink( get_the_ID() ) ) + 5 );
 	$max_length = 280 - $count;
 	ob_start();
@@ -558,9 +561,12 @@ function _safe_markup_default() {
 			value="1"
 			<?php checked( autoshare_enabled( get_the_ID() ) ); ?>
 		>
+		<input type="hidden" name="autoshare-classic-editor" value="1" />
 		<span id="autoshare-for-twitter-icon" class="dashicons-before dashicons-twitter"></span>
 		<?php esc_html_e( 'Tweet this post', 'autoshare-for-twitter' ); ?>
-		<a href="#edit_tweet_text" id="autoshare-for-twitter-edit"><?php esc_html_e( 'Edit', 'autoshare-for-twitter' ); ?></a>
+		<a href="#edit_tweet_text" id="autoshare-for-twitter-edit" style="<?php echo ( ( ! empty( $custom_tweet_body ) ) ? 'display: none;' : '' ); ?>">
+			<?php esc_attr_e( 'Edit', 'autoshare-for-twitter' ); ?>
+		</a>
 	</label>
 
 	<div class="autoshare-for-twitter-tweet-allow-image-wrap" style="display: none;">
@@ -583,7 +589,7 @@ function _safe_markup_default() {
 	render_twitter_accounts( get_the_ID() );
 	?>
 
-	<div id="autoshare-for-twitter-override-body" style="display: none;">
+	<div id="autoshare-for-twitter-override-body" style="<?php echo ( ( empty( $custom_tweet_body ) ) ? 'display: none;' : '' ); ?>">
 		<label for="<?php echo esc_attr( sprintf( '%s[%s]', META_PREFIX, TWEET_BODY_KEY ) ); ?>">
 			<?php esc_html_e( 'Custom Message', 'autoshare-for-twitter' ); ?>:
 		</label>
@@ -593,7 +599,7 @@ function _safe_markup_default() {
 			name="<?php echo esc_attr( sprintf( '%s[%s]', META_PREFIX, TWEET_BODY_KEY ) ); ?>"
 			rows="3"
 			maxlength="<?php echo esc_attr( $max_length ); ?>"
-		><?php echo esc_textarea( Utils\get_autoshare_for_twitter_meta( get_the_ID(), TWEET_BODY_KEY ) ); ?></textarea>
+		><?php echo esc_textarea( $custom_tweet_body ); ?></textarea>
 		<p class="howto" id="autoshare-for-twitter-text-desc"><?php esc_html_e( 'Character count is inclusive of the post permalink which will be included in the final tweet.', 'autoshare-for-twitter' ); ?></p>
 
 		<p><a href="#" class="hide-if-no-js cancel-tweet-text"><?php esc_html_e( 'Hide', 'autoshare-for-twitter' ); ?></a></p>
diff --git a/includes/admin/post-transition.php b/includes/admin/post-transition.php
index 7c98d50d..ad618de9 100644
--- a/includes/admin/post-transition.php
+++ b/includes/admin/post-transition.php
@@ -19,6 +19,8 @@
 use function TenUp\AutoshareForTwitter\Utils\get_autoshare_for_twitter_meta;
 use function TenUp\AutoshareForTwitter\Core\Post_Meta\get_tweet_status_logs;
 
+use const TenUp\AutoshareForTwitter\Core\Post_Meta\TWEET_BODY_KEY;
+
 /**
  * Setup function.
  *
@@ -171,6 +173,12 @@ function publish_tweet( $post_id, $force = false ) {
 			}
 		}
 
+		if ( ! $failed ) {
+			// Clear the tweet body on successful publishing to Twitter.
+			Utils\delete_autoshare_for_twitter_meta( $post->ID, TWEET_BODY_KEY );
+			remove_action( 'save_post', 'TenUp\AutoshareForTwitter\Core\Post_Meta\save_tweet_meta', 10 );
+		}
+
 		return ( ! $failed );
 	}
 
diff --git a/includes/admin/settings.php b/includes/admin/settings.php
index ce8660a4..787f34db 100644
--- a/includes/admin/settings.php
+++ b/includes/admin/settings.php
@@ -381,10 +381,8 @@ function cred_section_cb() {
 					?>
 				</li>
 				<li><?php esc_html_e( 'Switch from the "Settings" tab to the "Keys and tokens" tab.', 'autoshare-for-twitter' ); ?></li>
-				<li><?php echo wp_kses_data( __( 'Click on the <code>Generate</code> button in the <code>API Key and Secret</code> section.', 'autoshare-for-twitter' ) ); ?></li>
+				<li><?php echo wp_kses_data( __( 'Click on the <code>Generate</code>/<code>Regenerate</code> button in the <code>Consumer Keys</code> section.', 'autoshare-for-twitter' ) ); ?></li>
 				<li><?php echo wp_kses_data( __( 'Copy the <code>API Key</code> and <code>API Key Secret</code> values and paste them below.', 'autoshare-for-twitter' ) ); ?></li>
-				<li><?php echo wp_kses_data( __( 'Click on the <code>Generate</code> button in the <code>Access Token and Secret</code> section.', 'autoshare-for-twitter' ) ); ?></li>
-				<li><?php echo wp_kses_data( __( 'Copy the <code>Access Token</code> and <code>Access Token Secret</code> values and paste them below.', 'autoshare-for-twitter' ) ); ?></li>
 			</ul>
 
 			<h4><?php esc_html_e( '3. Save settings', 'autoshare-for-twitter' ); ?></h4>
diff --git a/includes/class-twitter-api.php b/includes/class-twitter-api.php
index f1e91fba..68b9eaa0 100644
--- a/includes/class-twitter-api.php
+++ b/includes/class-twitter-api.php
@@ -44,13 +44,6 @@ class Twitter_API {
 	 */
 	protected $access_token_secret;
 
-	/**
-	 * The twitter handle.
-	 *
-	 * @var string The twitter handle.
-	 */
-	protected $twitter_handle;
-
 	/**
 	 * The TwitterOAuth client.
 	 *
@@ -172,6 +165,9 @@ public function get_current_account() {
 		);
 
 		if ( ! $user || ! isset( $user->data ) || ! isset( $user->data->id ) ) {
+			if ( ! empty( $user->detail ) ) {
+				return new \WP_Error( 'error_get_twitter_user', $user->detail );
+			}
 			return new \WP_Error( 'error_get_twitter_user', __( 'Something went wrong during getting user details', 'autoshare-for-twitter' ) );
 		}
 
diff --git a/package-lock.json b/package-lock.json
index 86a88df1..0985c92e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "@10up/autoshare-for-twitter",
-	"version": "2.1.0",
+	"version": "2.1.1",
 	"lockfileVersion": 2,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "@10up/autoshare-for-twitter",
-			"version": "2.1.0",
+			"version": "2.1.1",
 			"dependencies": {
 				"@wordpress/api-fetch": "^3.5.0"
 			},
@@ -22,6 +22,7 @@
 				"babel-eslint": "^10.0.3",
 				"babel-loader": "^8.0.6",
 				"cypress": "^11.2.0",
+				"cypress-iframe": "^1.0.1",
 				"cypress-mochawesome-reporter": "^3.5.1",
 				"eslint": "^6.3.0",
 				"husky": "^3.0.5",
@@ -1961,9 +1962,9 @@
 			}
 		},
 		"node_modules/@cypress/request": {
-			"version": "2.88.10",
-			"resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.10.tgz",
-			"integrity": "sha512-Zp7F+R93N0yZyG34GutyTNr+okam7s/Fzc1+i3kcqOP8vk6OuajuE9qZJ6Rs+10/1JFtXFYMdyarnU1rZuJesg==",
+			"version": "2.88.12",
+			"resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.12.tgz",
+			"integrity": "sha512-tOn+0mDZxASFM+cuAP9szGUGPI1HwWVSvdzm7V4cCsPdFTx6qMj29CwaQmRAMIEhORIUBFBsYROYJcveK4uOjA==",
 			"dev": true,
 			"dependencies": {
 				"aws-sign2": "~0.7.0",
@@ -1979,9 +1980,9 @@
 				"json-stringify-safe": "~5.0.1",
 				"mime-types": "~2.1.19",
 				"performance-now": "^2.1.0",
-				"qs": "~6.5.2",
+				"qs": "~6.10.3",
 				"safe-buffer": "^5.1.2",
-				"tough-cookie": "~2.5.0",
+				"tough-cookie": "^4.1.3",
 				"tunnel-agent": "^0.6.0",
 				"uuid": "^8.3.2"
 			},
@@ -3745,6 +3746,17 @@
 				"@types/responselike": "*"
 			}
 		},
+		"node_modules/@types/cypress": {
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/@types/cypress/-/cypress-1.1.3.tgz",
+			"integrity": "sha512-OXe0Gw8LeCflkG1oPgFpyrYWJmEKqYncBsD/J0r17r0ETx/TnIGDNLwXt/pFYSYuYTpzcq1q3g62M9DrfsBL4g==",
+			"deprecated": "This is a stub types definition for cypress (https://cypress.io). cypress provides its own type definitions, so you don't need @types/cypress installed!",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"cypress": "*"
+			}
+		},
 		"node_modules/@types/eslint": {
 			"version": "8.4.7",
 			"resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.7.tgz",
@@ -6031,6 +6043,15 @@
 				"node": ">=12.0.0"
 			}
 		},
+		"node_modules/cypress-iframe": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/cypress-iframe/-/cypress-iframe-1.0.1.tgz",
+			"integrity": "sha512-Ne+xkZmWMhfq3x6wbfzK/SzsVTCrJru3R3cLXsoSAZyfUtJDamXyaIieHXeea3pQDXF4wE2w4iUuvCYHhoD31g==",
+			"dev": true,
+			"peerDependencies": {
+				"@types/cypress": "^1.1.0"
+			}
+		},
 		"node_modules/cypress-mochawesome-reporter": {
 			"version": "3.5.1",
 			"resolved": "https://registry.npmjs.org/cypress-mochawesome-reporter/-/cypress-mochawesome-reporter-3.5.1.tgz",
@@ -13735,14 +13756,26 @@
 			}
 		},
 		"node_modules/qs": {
-			"version": "6.5.3",
-			"resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz",
-			"integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==",
+			"version": "6.10.4",
+			"resolved": "https://registry.npmjs.org/qs/-/qs-6.10.4.tgz",
+			"integrity": "sha512-OQiU+C+Ds5qiH91qh/mg0w+8nwQuLjM4F4M/PbmhDOoYehPh+Fb0bDjtR1sOvy7YKxvj28Y/M0PhP5uVX0kB+g==",
 			"dev": true,
+			"dependencies": {
+				"side-channel": "^1.0.4"
+			},
 			"engines": {
 				"node": ">=0.6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
+		"node_modules/querystringify": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
+			"integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
+			"dev": true
+		},
 		"node_modules/queue-microtask": {
 			"version": "1.2.3",
 			"resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
@@ -14229,6 +14262,12 @@
 				"node": ">=0.10.5"
 			}
 		},
+		"node_modules/requires-port": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+			"integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
+			"dev": true
+		},
 		"node_modules/resolve": {
 			"version": "1.22.1",
 			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
@@ -15837,16 +15876,27 @@
 			}
 		},
 		"node_modules/tough-cookie": {
-			"version": "2.5.0",
-			"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
-			"integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
+			"version": "4.1.3",
+			"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz",
+			"integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==",
 			"dev": true,
 			"dependencies": {
-				"psl": "^1.1.28",
-				"punycode": "^2.1.1"
+				"psl": "^1.1.33",
+				"punycode": "^2.1.1",
+				"universalify": "^0.2.0",
+				"url-parse": "^1.5.3"
 			},
 			"engines": {
-				"node": ">=0.8"
+				"node": ">=6"
+			}
+		},
+		"node_modules/tough-cookie/node_modules/universalify": {
+			"version": "0.2.0",
+			"resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
+			"integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
+			"dev": true,
+			"engines": {
+				"node": ">= 4.0.0"
 			}
 		},
 		"node_modules/tr46": {
@@ -16136,6 +16186,16 @@
 			"integrity": "sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==",
 			"deprecated": "Please see https://github.com/lydell/urix#deprecated"
 		},
+		"node_modules/url-parse": {
+			"version": "1.5.10",
+			"resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
+			"integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
+			"dev": true,
+			"dependencies": {
+				"querystringify": "^2.1.1",
+				"requires-port": "^1.0.0"
+			}
+		},
 		"node_modules/use": {
 			"version": "3.1.1",
 			"resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
@@ -16572,9 +16632,9 @@
 			"dev": true
 		},
 		"node_modules/word-wrap": {
-			"version": "1.2.3",
-			"resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-			"integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+			"version": "1.2.4",
+			"resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.4.tgz",
+			"integrity": "sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA==",
 			"dev": true,
 			"engines": {
 				"node": ">=0.10.0"
@@ -18111,9 +18171,9 @@
 			"optional": true
 		},
 		"@cypress/request": {
-			"version": "2.88.10",
-			"resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.10.tgz",
-			"integrity": "sha512-Zp7F+R93N0yZyG34GutyTNr+okam7s/Fzc1+i3kcqOP8vk6OuajuE9qZJ6Rs+10/1JFtXFYMdyarnU1rZuJesg==",
+			"version": "2.88.12",
+			"resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.12.tgz",
+			"integrity": "sha512-tOn+0mDZxASFM+cuAP9szGUGPI1HwWVSvdzm7V4cCsPdFTx6qMj29CwaQmRAMIEhORIUBFBsYROYJcveK4uOjA==",
 			"dev": true,
 			"requires": {
 				"aws-sign2": "~0.7.0",
@@ -18129,9 +18189,9 @@
 				"json-stringify-safe": "~5.0.1",
 				"mime-types": "~2.1.19",
 				"performance-now": "^2.1.0",
-				"qs": "~6.5.2",
+				"qs": "~6.10.3",
 				"safe-buffer": "^5.1.2",
-				"tough-cookie": "~2.5.0",
+				"tough-cookie": "^4.1.3",
 				"tunnel-agent": "^0.6.0",
 				"uuid": "^8.3.2"
 			}
@@ -19515,6 +19575,16 @@
 				"@types/responselike": "*"
 			}
 		},
+		"@types/cypress": {
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/@types/cypress/-/cypress-1.1.3.tgz",
+			"integrity": "sha512-OXe0Gw8LeCflkG1oPgFpyrYWJmEKqYncBsD/J0r17r0ETx/TnIGDNLwXt/pFYSYuYTpzcq1q3g62M9DrfsBL4g==",
+			"dev": true,
+			"peer": true,
+			"requires": {
+				"cypress": "*"
+			}
+		},
 		"@types/eslint": {
 			"version": "8.4.7",
 			"resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.7.tgz",
@@ -21424,6 +21494,13 @@
 				}
 			}
 		},
+		"cypress-iframe": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/cypress-iframe/-/cypress-iframe-1.0.1.tgz",
+			"integrity": "sha512-Ne+xkZmWMhfq3x6wbfzK/SzsVTCrJru3R3cLXsoSAZyfUtJDamXyaIieHXeea3pQDXF4wE2w4iUuvCYHhoD31g==",
+			"dev": true,
+			"requires": {}
+		},
 		"cypress-mochawesome-reporter": {
 			"version": "3.5.1",
 			"resolved": "https://registry.npmjs.org/cypress-mochawesome-reporter/-/cypress-mochawesome-reporter-3.5.1.tgz",
@@ -27255,9 +27332,18 @@
 			"integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
 		},
 		"qs": {
-			"version": "6.5.3",
-			"resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz",
-			"integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==",
+			"version": "6.10.4",
+			"resolved": "https://registry.npmjs.org/qs/-/qs-6.10.4.tgz",
+			"integrity": "sha512-OQiU+C+Ds5qiH91qh/mg0w+8nwQuLjM4F4M/PbmhDOoYehPh+Fb0bDjtR1sOvy7YKxvj28Y/M0PhP5uVX0kB+g==",
+			"dev": true,
+			"requires": {
+				"side-channel": "^1.0.4"
+			}
+		},
+		"querystringify": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
+			"integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
 			"dev": true
 		},
 		"queue-microtask": {
@@ -27635,6 +27721,12 @@
 			"integrity": "sha512-L9jEkOi3ASd9PYit2cwRfyppc9NoABujTP8/5gFcbERmo5jUoAKovIC3fsF17pkTnGsrByysqX+Kxd2OTNI1ww==",
 			"dev": true
 		},
+		"requires-port": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+			"integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
+			"dev": true
+		},
 		"resolve": {
 			"version": "1.22.1",
 			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
@@ -28893,13 +28985,23 @@
 			"peer": true
 		},
 		"tough-cookie": {
-			"version": "2.5.0",
-			"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
-			"integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
+			"version": "4.1.3",
+			"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz",
+			"integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==",
 			"dev": true,
 			"requires": {
-				"psl": "^1.1.28",
-				"punycode": "^2.1.1"
+				"psl": "^1.1.33",
+				"punycode": "^2.1.1",
+				"universalify": "^0.2.0",
+				"url-parse": "^1.5.3"
+			},
+			"dependencies": {
+				"universalify": {
+					"version": "0.2.0",
+					"resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
+					"integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
+					"dev": true
+				}
 			}
 		},
 		"tr46": {
@@ -29116,6 +29218,16 @@
 			"resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
 			"integrity": "sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg=="
 		},
+		"url-parse": {
+			"version": "1.5.10",
+			"resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
+			"integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
+			"dev": true,
+			"requires": {
+				"querystringify": "^2.1.1",
+				"requires-port": "^1.0.0"
+			}
+		},
 		"use": {
 			"version": "3.1.1",
 			"resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
@@ -29441,9 +29553,9 @@
 			"dev": true
 		},
 		"word-wrap": {
-			"version": "1.2.3",
-			"resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-			"integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+			"version": "1.2.4",
+			"resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.4.tgz",
+			"integrity": "sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA==",
 			"dev": true
 		},
 		"workerpool": {
diff --git a/package.json b/package.json
index 54f713af..756a97d5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@10up/autoshare-for-twitter",
-	"version": "2.1.0",
+	"version": "2.1.1",
 	"description": "Automatically tweets a post title, URL, and optional description.",
 	"scripts": {
 		"watch": "webpack -w --devtool eval-cheap-module-source-map --output-pathinfo --mode development --config webpack.gutenberg.config.js",
@@ -9,6 +9,7 @@
 		"env": "wp-env",
 		"env:start": "wp-env start",
 		"env:stop": "wp-env stop",
+		"env:destroy": "wp-env destroy",
 		"postenv:start": "./tests/bin/initialize.sh",
 		"cypress:open": "cypress open --config-file tests/cypress/cypress.config.js --e2e --browser chrome",
 		"cypress:run": "cypress run --config-file tests/cypress/cypress.config.js",
@@ -48,6 +49,7 @@
 		"babel-eslint": "^10.0.3",
 		"babel-loader": "^8.0.6",
 		"cypress": "^11.2.0",
+		"cypress-iframe": "^1.0.1",
 		"cypress-mochawesome-reporter": "^3.5.1",
 		"eslint": "^6.3.0",
 		"husky": "^3.0.5",
diff --git a/readme.txt b/readme.txt
index 46d1ca63..bdbd93fb 100644
--- a/readme.txt
+++ b/readme.txt
@@ -2,9 +2,9 @@
 Contributors:      10up, johnwatkins0, adamsilverstein, scottlee, dinhtungdu, jeffpaul, dharm1025
 Tags:              twitter, tweet, autoshare, auto-share, auto share, share, sharing, social media, posse
 Requires at least: 5.7
-Tested up to:      6.2
+Tested up to:      6.3
 Requires PHP:      7.4
-Stable tag:        2.1.0
+Stable tag:        2.1.1
 License:           GPL-2.0-or-later
 License URI:       https://spdx.org/licenses/GPL-2.0-or-later.html
 
@@ -110,7 +110,17 @@ To avoid encountering this error in the future and to have higher usage limits,
 4. Autoshare for Twitter Settings, found under `Settings` > `Autoshare for Twitter`.
 
 == Changelog ==
-= 2.1.0 - 2023-07-05 =
+= 2.1.0 - 2023-08-XX =
+* **Changed:** Improved setup instructions and error handing (props [@johnwatkins0](https://github.com/johnwatkins0), [@iamdharmesh](https://github.com/iamdharmesh), [@jeffpaul](https://github.com/jeffpaul) via [#255](https://github.com/10up/autoshare-for-twitter/pull/255)).
+* **Changed:** Bump WordPress "tested up to" version 6.3 (props [@iamdharmesh](https://github.com/iamdharmesh), [@jeffpaul](https://github.com/jeffpaul) via [#265](https://github.com/10up/autoshare-for-twitter/pull/265)).
+* **Fixed:** The custom tweet message does not work with scheduled posts (props [@GeoffLambert77](https://github.com/GeoffLambert77), [@iamdharmesh](https://github.com/iamdharmesh), [@Sidsector9](https://github.com/Sidsector9) via [#267](https://github.com/10up/autoshare-for-twitter/pull/267)).
+* **Fixed:** Connected Twitter accounts visibility in the classic editor (props [@iamdharmesh](https://github.com/iamdharmesh), [@Sidsector9](https://github.com/Sidsector9) via [#269](https://github.com/10up/autoshare-for-twitter/pull/269)).
+* **Fixed:** Better error handling for environments that don't match our minimum PHP version (props [@dkotter](https://github.com/dkotter), [@rahulsprajapati](https://github.com/rahulsprajapati), [@iamdharmesh](https://github.com/iamdharmesh) via [#258](https://github.com/10up/autoshare-for-twitter/pull/258)).
+* **Fixed:** Ensure our E2E tests work properly on WordPress 6.3 (props [@iamdharmesh](https://github.com/iamdharmesh), [@dkotter](https://github.com/dkotter) via [#264](https://github.com/10up/autoshare-for-twitter/pull/264)).
+* **Security:** Bump `tough-cookie` from 2.5.0 to 4.1.3 and `@cypress/request` from 2.88.10 to 2.88.12 (props [@dependabot[bot]](https://github.com/apps/dependabot), [@iamdharmesh](https://github.com/iamdharmesh) via [#266](https://github.com/10up/autoshare-for-twitter/pull/266)).
+* **Security:** Bump `word-wrap` from 1.2.3 to 1.2.4 (props [@dependabot[bot]](https://github.com/apps/dependabot), [@iamdharmesh](https://github.com/iamdharmesh) via [#257](https://github.com/10up/autoshare-for-twitter/pull/257)).
+
+= 2.1.0 - 2023-07-06 =
 * **Added:** Support for tweeting via multiple Twitter accounts (props [@iamdharmesh](https://github.com/iamdharmesh), [@jeffpaul](https://github.com/jeffpaul), [@Sidsector9](https://github.com/Sidsector9) via [#238](https://github.com/10up/autoshare-for-twitter/pull/238)).
 * **Added:** Obfuscation of saved Twitter keys in the UI (props [@lgrzegorski](https://github.com/lgrzegorski), [@bmarshall511](https://github.com/bmarshall511), [@iamdharmesh](https://github.com/iamdharmesh) via [#245](https://github.com/10up/autoshare-for-twitter/pull/245)).
 * **Added:** GitHub Action summary for end-to-end tests (props [@iamdharmesh](https://github.com/iamdharmesh), [@ravinderk](https://github.com/ravinderk) via [#247](https://github.com/10up/autoshare-for-twitter/pull/247)).
diff --git a/src/js/AutoshareForTwitterPostStatusInfo.js b/src/js/AutoshareForTwitterPostStatusInfo.js
index 05d584a2..ec07be6f 100644
--- a/src/js/AutoshareForTwitterPostStatusInfo.js
+++ b/src/js/AutoshareForTwitterPostStatusInfo.js
@@ -5,13 +5,14 @@ import { withSelect, useSelect } from '@wordpress/data';
 import { Button, ToggleControl, Icon } from '@wordpress/components';
 import { TweetTextField } from './components/TweetTextField';
 import { TwitterAccounts } from './components/TwitterAccounts';
-import { useHasFeaturedImage, useAllowTweetImage, useSaveTwitterData } from './hooks';
+import { useHasFeaturedImage, useAllowTweetImage, useSaveTwitterData, useTweetText } from './hooks';
 
 import { StatusLogs } from './components/StatusLogs';
 
 export function AutoshareForTwitterPostStatusInfo() {
 	const hasFeaturedImage = useHasFeaturedImage();
 	const [ allowTweetImage, setAllowTweetImage ] = useAllowTweetImage();
+	const [ , setTweetText ] = useTweetText();
 	const [ reTweet, setReTweet ] = useState( false );
 	const [ tweetNow, setTweetNow ] = useState( false );
 	const { messages } = useSelect( ( select ) => {
@@ -41,6 +42,10 @@ export function AutoshareForTwitterPostStatusInfo() {
 
 		const { data } = await apiResponse.json();
 
+		// Clear the tweet text if the tweet was successful.
+		if ( data.is_retweeted ) {
+			setTweetText( '' );
+		}
 		setStatusMessages( data );
 		setReTweet( false );
 	};
diff --git a/src/js/components/TweetTextField.js b/src/js/components/TweetTextField.js
index 3bf2dc70..3c4dacf1 100644
--- a/src/js/components/TweetTextField.js
+++ b/src/js/components/TweetTextField.js
@@ -3,6 +3,7 @@ import { useSelect } from '@wordpress/data';
 import { siteUrl } from 'admin-autoshare-for-twitter';
 import { __, sprintf } from '@wordpress/i18n';
 import { useTweetText } from '../hooks';
+import { useEffect, useState } from '@wordpress/element';
 
 export function TweetTextField() {
 	const getPermalinkLength = ( select ) => {
@@ -47,6 +48,18 @@ export function TweetTextField() {
 	const [ tweetText, setTweetText ] = useTweetText();
 	const { tweetLength, overrideLengthClass } = getTweetLength();
 
+	const status = useSelect( ( __select ) =>  __select( 'core/editor' ).getEditedPostAttribute( 'status' ) );
+	const [ isPublished, setIsPublished ] = useState( status === 'publish' );
+
+	useEffect( () => {
+		if ( 'publish' !==  status || isPublished ) {
+			return;
+		}
+
+		setTweetText( '' );
+		setIsPublished( true );
+	}, [ status, isPublished ] );
+
 	const CounterTooltip = () => (
 		<Tooltip 
 			text={ __( 'Count is inclusive of the post permalink which will be included in the final tweet.', 'autoshare-for-twitter' ) }>
diff --git a/src/js/store/reducer.js b/src/js/store/reducer.js
index 825161ca..71dfd058 100644
--- a/src/js/store/reducer.js
+++ b/src/js/store/reducer.js
@@ -1,4 +1,4 @@
-import { enabled, allowTweetImage, tweetAccounts } from 'admin-autoshare-for-twitter';
+import { enabled, allowTweetImage, tweetAccounts, customTweetBody } from 'admin-autoshare-for-twitter';
 
 import {
 	SET_AUTOSHARE_FOR_TWITTER_ENABLED,
@@ -15,9 +15,9 @@ export const DEFAULT_STATE = {
 	autoshareEnabled: ( ! ! enabled && '0' !== enabled ),
 	errorMessage: '',
 	loaded: false,
-	overriding: false,
+	overriding: customTweetBody ? true : false,
 	overrideLength: 0,
-	tweetText: '',
+	tweetText : customTweetBody || '',
 	allowTweetImage: ! ! allowTweetImage,
 	tweetAccounts: tweetAccounts || [],
 };
diff --git a/tests/bin/set-wp-config.js b/tests/bin/set-wp-config.js
index 9125a305..c1f438dc 100755
--- a/tests/bin/set-wp-config.js
+++ b/tests/bin/set-wp-config.js
@@ -4,7 +4,7 @@ const fs = require( 'fs' );
 
 const path = `${ process.cwd() }/.wp-env.json`;
 
-let config = fs.existsSync( path ) ? require( path ) : { plugins: [ '.', 'https://downloads.wordpress.org/plugin/classic-editor.1.6.1.zip' ] };
+let config = fs.existsSync( path ) ? require( path ) : { plugins: [ '.', 'https://downloads.wordpress.org/plugin/classic-editor.zip' ] };
 
 const args = {};
 process.argv
diff --git a/tests/cypress/cypress.config.js b/tests/cypress/cypress.config.js
index 0c2aae74..8d458e65 100644
--- a/tests/cypress/cypress.config.js
+++ b/tests/cypress/cypress.config.js
@@ -2,6 +2,7 @@ const { defineConfig } = require('cypress');
 const { readConfig } = require('@wordpress/env/lib/config');
 
 module.exports = defineConfig({
+  chromeWebSecurity: false,
   fixturesFolder: 'tests/cypress/fixtures',
   screenshotsFolder: 'tests/cypress/screenshots',
   videosFolder: 'tests/cypress/videos',
diff --git a/tests/cypress/e2e/block-editor.test.js b/tests/cypress/e2e/block-editor.test.js
index bfdf93a0..08bded9d 100644
--- a/tests/cypress/e2e/block-editor.test.js
+++ b/tests/cypress/e2e/block-editor.test.js
@@ -183,4 +183,38 @@ describe('Test Autoshare for Twitter with Block Editor.', () => {
 			cy.get('.autoshare-for-twitter-log a').contains('Tweeted on');
 		});
 	});
+
+	it('Tests that custom tweet message remain persistent for Tweet', () => {
+		const customTweetBody = `Custom Tweet ${getRandomText(6)}`;
+		// Start create new post by enter post title
+		cy.startCreatePost();
+
+		// Open AutoTweet Panel and set custom tweet message.
+		cy.openDocumentSettingsPanel('Autotweet enabled');
+		cy.get('.autoshare-for-twitter-prepublish__override-row button').click();
+		cy.get('.autoshare-for-twitter-tweet-text textarea').clear().type(customTweetBody);
+
+		// Save Draft
+		cy.get('.editor-post-save-draft').should('be.visible');
+		cy.get('.editor-post-save-draft').click();
+		cy.get('.editor-post-saved-state').should('have.text', 'Saved');
+
+		// Verify custom tweet message.
+		cy.reload();
+		cy.get('.autoshare-for-twitter-tweet-text textarea').should('have.value', customTweetBody);
+
+		// Open pre-publish Panel.
+		cy.openPrePublishPanel();
+
+		// Publish
+		cy.publishPost();
+
+		// Post-publish.
+		cy.get('.autoshare-for-twitter-post-status').should('be.visible');
+		cy.get('.autoshare-for-twitter-post-status').contains('Tweeted on');
+
+		// Verify custom tweet message is cleared on publish.
+		cy.get('.post-publish-panel__postpublish button.autoshare-for-twitter-tweet-now').click();
+		cy.get('.post-publish-panel__postpublish .autoshare-for-twitter-tweet-text textarea').should('have.value', '');
+	});
 });
diff --git a/tests/cypress/e2e/classic-editor.test.js b/tests/cypress/e2e/classic-editor.test.js
index 1151945c..ad6680bb 100644
--- a/tests/cypress/e2e/classic-editor.test.js
+++ b/tests/cypress/e2e/classic-editor.test.js
@@ -148,4 +148,32 @@ describe('Test Autoshare for Twitter with Classic Editor.', () => {
 			cy.get('.autoshare-for-twitter-status-log-data').contains('Tweeted on');
 		});
 	});
+
+	it('Tests that custom tweet message remain persistent for Tweet', () => {
+		const customTweetBody = `Custom Tweet ${getRandomText(6)}`;
+		// Start create post.
+		cy.classicStartCreatePost();
+
+		// Set custom tweet message.
+		cy.enableCheckbox('#autoshare-for-twitter-enable', true, true);
+		cy.get('#autoshare-for-twitter-edit').click();
+		cy.get('textarea#autoshare-for-twitter-text').clear().type(customTweetBody);
+
+		// Save Draft
+		cy.get('#save-post').click();
+
+		// verify custom tweet message.
+		cy.get('textarea#autoshare-for-twitter-text').should('have.value', customTweetBody);
+
+		// publish
+		cy.get('#publish').should('be.visible').click({force: true});
+
+		// Post-publish.
+		cy.get('#autoshare_for_twitter_metabox',).should('be.visible');
+		cy.get('#autoshare_for_twitter_metabox',).contains('Tweeted on');
+
+		// Verify custom tweet message is cleared on publish.
+		cy.get('button.tweet-now-button').click();
+		cy.get('textarea#autoshare-for-twitter-text').should('have.value', '');
+	});
 });
diff --git a/tests/cypress/support/commands.js b/tests/cypress/support/commands.js
index 2cba4c36..85d1056c 100644
--- a/tests/cypress/support/commands.js
+++ b/tests/cypress/support/commands.js
@@ -30,10 +30,13 @@ Cypress.Commands.add( 'startCreatePost', () => {
 	const titleInput = 'h1.editor-post-title__input, #post-title-0';
 
 	// Make sure editor loaded properly.
-	cy.get(titleInput).should('exist');
 	cy.closeWelcomeGuide();
+	cy.getBlockEditor().find(titleInput).should('exist');
 
-	cy.get(titleInput).clear().type(`Random Post Title ${getRandomText(6)}`);
+	cy.getBlockEditor()
+		.find(titleInput)
+		.clear()
+		.type(`Random Post Title ${getRandomText(6)}`);
 });
 
 
@@ -107,7 +110,7 @@ Cypress.Commands.add( 'markAccountForAutoshare', ( enable = true ) => {
 Cypress.Commands.add( 'enableEditor', ( editor = 'block' ) => {
 	cy.visit('/wp-admin/options-writing.php#classic-editor-options');
 		cy.get(`#classic-editor-${editor}`).click();
-		cy.get('#classic-editor-allow').click();
+		cy.get('#classic-editor-disallow').click();
 		cy.get('#submit').click();
 });
 
@@ -165,3 +168,31 @@ Cypress.Commands.add( 'publishPost', () => {
 	cy.get('[aria-disabled="false"].editor-post-publish-button').click();
     cy.wait('@publishPost');
 });
+
+Cypress.Commands.add('getBlockEditor', () => {
+	cy.get('.edit-post-visual-editor').should('be.visible');
+	return cy
+		.get('body')
+		.then(($body) => {
+			if ($body.find('iframe[name="editor-canvas"]').length) {
+				return cy.iframe('iframe[name="editor-canvas"]');
+			}
+			return $body;
+		})
+		.then(cy.wrap);
+});
+
+Cypress.Commands.add('closeWelcomeGuide', () => {
+	cy.window().then((win) => {
+		const { wp } = win;
+		if (
+			wp.data
+				.select('core/edit-post')
+				.isFeatureActive('welcomeGuide')
+		) {
+			wp.data
+				.dispatch('core/edit-post')
+				.toggleFeature('welcomeGuide');
+		}
+	});
+});
diff --git a/tests/cypress/support/e2e.js b/tests/cypress/support/e2e.js
index 2f8b8334..592aa277 100644
--- a/tests/cypress/support/e2e.js
+++ b/tests/cypress/support/e2e.js
@@ -1,4 +1,5 @@
 import '@10up/cypress-wp-utils';
+import 'cypress-iframe';
 import './commands';
 
 beforeEach(() => {