diff --git a/app/src/main/java/org/briarproject/hotspot/ConditionManagerImpl.java b/app/src/main/java/org/briarproject/hotspot/ConditionManagerImpl.java
index 296a05059b101e9545cc6b2ab04f96276f612554..93b4b4a623d647b8d33e019092adaeacff53f5ad 100644
--- a/app/src/main/java/org/briarproject/hotspot/ConditionManagerImpl.java
+++ b/app/src/main/java/org/briarproject/hotspot/ConditionManagerImpl.java
@@ -62,7 +62,7 @@ class ConditionManagerImpl extends ConditionManager {
 			// in progress toward the requested state".
 			if (wifiManager.setWifiEnabled(true)) {
 				LOG.info("Enabled wifi");
-				return false;
+				return wifiP2pEnabled;
 			}
 
 			// Wifi is not enabled and we can't seem to enable it, so ask the user