diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/wear/WearFragment.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/wear/WearFragment.kt
index 2a11088864..7798e89b37 100644
--- a/plugins/main/src/main/java/info/nightscout/plugins/general/wear/WearFragment.kt
+++ b/plugins/main/src/main/java/info/nightscout/plugins/general/wear/WearFragment.kt
@@ -82,7 +82,7 @@ class WearFragment : DaggerFragment() {
             .subscribe({
                            it.customWatchfaceData?.let { wearPlugin.savedCustomWatchface = it }
                            if (it.exportFile)
-                               ToastUtils.okToast(context,rh.gs(R.string.wear_new_custom_watchface_received))
+                               ToastUtils.okToast(activity, rh.gs(R.string.wear_new_custom_watchface_exported))
                            updateGui()
                        }, fabricPrivacy::logException)
         if (wearPlugin.savedCustomWatchface == null)
diff --git a/plugins/main/src/main/res/values/strings.xml b/plugins/main/src/main/res/values/strings.xml
index b8d2b4eccf..0cb11d304e 100644
--- a/plugins/main/src/main/res/values/strings.xml
+++ b/plugins/main/src/main/res/values/strings.xml
@@ -365,7 +365,7 @@
     <string name="wear_load_watchface">Load Watchface</string>
     <string name="wear_send_watchface">Send Watchface</string>
     <string name="wear_export_watchface">Export Watchface</string>
-    <string name="wear_new_custom_watchface_received">New watchface received from watch</string>
+    <string name="wear_new_custom_watchface_exported">Custom watchface exported</string>
     <string name="resend_all_data">Resend All Data</string>
     <string name="open_settings_on_wear">Open Settings on Wear</string>
 
diff --git a/wear/src/main/java/info/nightscout/androidaps/watchfaces/CustomWatchface.kt b/wear/src/main/java/info/nightscout/androidaps/watchfaces/CustomWatchface.kt
index cbf70ee8d5..d96410b81e 100644
--- a/wear/src/main/java/info/nightscout/androidaps/watchfaces/CustomWatchface.kt
+++ b/wear/src/main/java/info/nightscout/androidaps/watchfaces/CustomWatchface.kt
@@ -117,9 +117,9 @@ class CustomWatchface : BaseWatchFace() {
 
     private fun setWatchfaceStyle() {
         val customWatchface = persistence.readCustomWatchface() ?: persistence.readCustomWatchface(true)
-        customWatchface?.let { customWatchface ->
-            val json = JSONObject(customWatchface.customWatchfaceData.json)
-            val drawableDataMap = customWatchface.customWatchfaceData.drawableDatas
+        customWatchface?.let {
+            val json = JSONObject(it.customWatchfaceData.json)
+            val drawableDataMap = it.customWatchfaceData.drawableDatas
             enableSecond = (if (json.has("enableSecond")) json.getBoolean("enableSecond") else false) && sp.getBoolean(R.string.key_show_seconds, true)
 
             highColor = if (json.has("highColor")) Color.parseColor(json.getString("highColor")) else ContextCompat.getColor(this, R.color.dark_highColor)