diff --git a/app/src/main/java/io/homeassistant/companion/android/nfc/NfcSetupActivity.kt b/app/src/main/java/io/homeassistant/companion/android/nfc/NfcSetupActivity.kt
index 9bacc1dd7f9..fd7d2ef467f 100644
--- a/app/src/main/java/io/homeassistant/companion/android/nfc/NfcSetupActivity.kt
+++ b/app/src/main/java/io/homeassistant/companion/android/nfc/NfcSetupActivity.kt
@@ -17,6 +17,10 @@ import io.homeassistant.companion.android.common.R as commonR
 import io.homeassistant.companion.android.nfc.views.LoadNfcView
 import io.homeassistant.companion.android.util.UrlUtil
 import io.homeassistant.companion.android.util.compose.HomeAssistantAppTheme
+import io.homeassistant.companion.android.webview.externalbus.ExternalBusMessage
+import io.homeassistant.companion.android.webview.externalbus.ExternalBusRepository
+import javax.inject.Inject
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 
 @AndroidEntryPoint
@@ -33,6 +37,9 @@ class NfcSetupActivity : BaseActivity() {
         }
     }
 
+    @Inject
+    lateinit var externalBusRepository: ExternalBusRepository
+
     companion object {
         val TAG = NfcSetupActivity::class.simpleName
         const val EXTRA_TAG_VALUE = "tag_value"
@@ -125,7 +132,19 @@ class NfcSetupActivity : BaseActivity() {
                             val message = commonR.string.nfc_write_tag_success
                             Toast.makeText(applicationContext, message, Toast.LENGTH_LONG).show()
 
-                            setResult(messageId)
+                            // TODO demo: send a response to the external bus from another activity
+                            externalBusRepository.send(
+                                ExternalBusMessage(
+                                    id = messageId,
+                                    type = "result",
+                                    success = true,
+                                    result = emptyMap<String, String>(),
+                                    callback = {
+                                        Log.d(TAG, "NFC Write Complete $it")
+                                    }
+                                )
+                            )
+                            delay(2000L)
                             finish()
                         } else {
                             viewModel.onNfcWriteSuccess(nfcTagToWriteUUID!!)
diff --git a/app/src/main/java/io/homeassistant/companion/android/webview/WebViewActivity.kt b/app/src/main/java/io/homeassistant/companion/android/webview/WebViewActivity.kt
index 1969cc93e32..1f37403441c 100644
--- a/app/src/main/java/io/homeassistant/companion/android/webview/WebViewActivity.kt
+++ b/app/src/main/java/io/homeassistant/companion/android/webview/WebViewActivity.kt
@@ -156,17 +156,7 @@ class WebViewActivity : BaseActivity(), io.homeassistant.companion.android.webvi
             }
         }
     private val writeNfcTag = registerForActivityResult(WriteNfcTag()) { messageId ->
-        sendExternalBusMessage(
-            ExternalBusMessage(
-                id = messageId,
-                type = "result",
-                success = true,
-                result = emptyMap<String, String>(),
-                callback = {
-                    Log.d(TAG, "NFC Write Complete $it")
-                }
-            )
-        )
+        // TODO demo: this is no longer used
     }
     private val showWebFileChooser = registerForActivityResult(ShowWebFileChooser()) { result ->
         mFilePathCallback?.onReceiveValue(result)