diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsInterface.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsInterface.java
index 08f2b769de2a..9813ec1ef03b 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsInterface.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsInterface.java
@@ -227,9 +227,11 @@ protected void finalize() throws Throwable {
 
     public void saveSettings() {
         SiteSettingsTable.saveSettings(mSettings);
-        siteSettingsPreferences(mContext).edit().putString(LANGUAGE_PREF_KEY, mSettings.language).apply();
-        siteSettingsPreferences(mContext).edit().putInt(DEF_CATEGORY_PREF_KEY, mSettings.defaultCategory).apply();
-        siteSettingsPreferences(mContext).edit().putString(DEF_FORMAT_PREF_KEY, mSettings.defaultPostFormat).apply();
+        siteSettingsPreferences(mContext).edit()
+                .putString(LANGUAGE_PREF_KEY, mSettings.language)
+                .putInt(DEF_CATEGORY_PREF_KEY, mSettings.defaultCategory)
+                .putString(DEF_FORMAT_PREF_KEY, mSettings.defaultPostFormat)
+                .apply();
     }
 
     public @NonNull String getTitle() {
@@ -940,9 +942,7 @@ public void run() {
     }
 
     protected void notifyFetchErrorOnUiThread(final Exception error) {
-        if (mContext == null
-                || (mContext instanceof Activity && ((Activity) mContext).isFinishing())
-                || mListener == null) {
+        if (mListener == null) {
             return;
         }
 
@@ -955,9 +955,7 @@ public void run() {
     }
 
     protected void notifySaveErrorOnUiThread(final Exception error) {
-        if (mContext == null
-                || (mContext instanceof Activity && ((Activity) mContext).isFinishing())
-                || mListener == null) {
+        if (mListener == null) {
             return;
         }
 
@@ -973,9 +971,7 @@ public void run() {
      * Notifies listener that settings have been updated with the latest remote data.
      */
     protected void notifyUpdatedOnUiThread() {
-        if (mContext == null
-                || (mContext instanceof Activity && ((Activity) mContext).isFinishing())
-                || mListener == null) {
+        if (mListener == null) {
             return;
         }
 
@@ -991,7 +987,9 @@ public void run() {
      * Notifies listener that settings have been saved or an error occurred while saving.
      */
     protected void notifySavedOnUiThread() {
-        if (mContext == null || mListener == null) return;
+        if (mListener == null) {
+            return;
+        }
 
         new Handler().post(new Runnable() {
             @Override