diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterService.kt b/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterService.kt
index 754892f4..c689d6f2 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterService.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterService.kt
@@ -408,7 +408,7 @@ class RepeaterService : Service(), CoroutineScope, WifiP2pManager.ChannelListene
         val networkName = networkName
         val passphrase = passphrase
         @SuppressLint("MissingPermission")  // missing permission will simply leading to returning ERROR
-        if (!safeMode || networkName == null || passphrase == null) {
+        if (!safeMode || networkName.isNullOrEmpty() || passphrase.isNullOrEmpty()) {
             persistNextGroup = true
             p2pManager.createGroup(channel, listener)
         } else @TargetApi(29) {