diff --git a/hotfixes/wc-api-dev-email-site-title.php b/hotfixes/wc-api-dev-email-site-title.php
new file mode 100644
index 0000000..9a301a4
--- /dev/null
+++ b/hotfixes/wc-api-dev-email-site-title.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * WooCommerce has settings for email subject and footer, which defaults to the 'site title'.
+ * However, this can easily become out of sync. This uses the provided filters to always
+ * return the current site title.
+ *
+ * @since 0.8.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+function wc_api_dev_email_from_name( $name ) {
+	return get_bloginfo( 'name', 'display' );
+}
+add_filter( 'woocommerce_email_from_name', 'wc_api_dev_email_from_name' );
+
+function wc_api_dev_email_footer_text( $text ) {
+	return sprintf( __( '%s - Powered by WooCommerce', 'woocommerce' ), get_bloginfo( 'name', 'display' ) );
+}
+add_filter( 'woocommerce_email_footer_text', 'wc_api_dev_email_footer_text' );
diff --git a/readme.txt b/readme.txt
index b424bdc..29baf26 100644
--- a/readme.txt
+++ b/readme.txt
@@ -27,6 +27,7 @@ This section describes how to install the plugin and get it working.
 
 = 0.8.0 =
 * Update orders endpoint to accept multiple statuses
+* Fix - Email subject and footers becoming out of sync
 
 = 0.7.1 =
 * Fix - add another URI to watch for when disabling sync during API requests
diff --git a/wc-api-dev.php b/wc-api-dev.php
index ef9a5c6..a9efba4 100644
--- a/wc-api-dev.php
+++ b/wc-api-dev.php
@@ -120,6 +120,7 @@ public function includes() {
 
 		// Things that aren't related to a specific endpoint but to things like cross-plugin compatibility
 		include_once( dirname( __FILE__ ) . '/hotfixes/wc-api-dev-jetpack-hotfixes.php' );
+		include_once( dirname( __FILE__ ) . '/hotfixes/wc-api-dev-email-site-title.php' );
 	}
 
 	/**