diff --git a/lib/screens/companion_remote/pairing_screen.dart b/lib/screens/companion_remote/pairing_screen.dart
index ac8231e1..2110980b 100644
--- a/lib/screens/companion_remote/pairing_screen.dart
+++ b/lib/screens/companion_remote/pairing_screen.dart
@@ -67,6 +67,7 @@ class _PairingScreenState extends State<PairingScreen> {
       }
     } catch (e) {
       appLogger.e('Failed to join remote session', error: e);
+      if (!mounted) return;
       setState(() {
         _isConnecting = false;
         _errorMessage = _parseErrorMessage(e.toString());
@@ -129,6 +130,7 @@ class _PairingScreenState extends State<PairingScreen> {
       }
     } catch (e) {
       appLogger.e('Failed to join remote session', error: e);
+      if (!mounted) return;
       _lastScannedCode = null; // Allow re-scanning
       setState(() {
         _isConnecting = false;