diff --git a/src/com/android/nfc/P2pLinkManager.java b/src/com/android/nfc/P2pLinkManager.java
index 4c8863b..4205c7a 100755
--- a/src/com/android/nfc/P2pLinkManager.java
+++ b/src/com/android/nfc/P2pLinkManager.java
@@ -643,7 +643,7 @@
                 }
             }
 
-            if (needsNdef) {
+            if (needsNdef || (needsHandover && handoverClient == null)) {
                 snepClient = new SnepClient();
                 try {
                     snepClient.connect();