diff --git a/msbuild/Xamarin.iOS.Tasks.Core/Tasks/DetectDebugNetworkConfigurationTaskBase.cs b/msbuild/Xamarin.iOS.Tasks.Core/Tasks/DetectDebugNetworkConfigurationTaskBase.cs
index 9200afb4dba1..67afc2cf72ac 100644
--- a/msbuild/Xamarin.iOS.Tasks.Core/Tasks/DetectDebugNetworkConfigurationTaskBase.cs
+++ b/msbuild/Xamarin.iOS.Tasks.Core/Tasks/DetectDebugNetworkConfigurationTaskBase.cs
@@ -38,11 +38,10 @@ public abstract class DetectDebugNetworkConfigurationBase : XamarinTask
 
 		public override bool Execute ()
 		{
-			var ips = new List<string> ();
-
 			if (SdkIsSimulator) {
-				ips.Add (IPAddress.Loopback.ToString ());
+				DebugIPAddresses = IPAddress.Loopback.ToString ();
 			} else if (DebugOverWiFi) {
+				var ips = new List<string> ();
 				string [] hosts = null;
 
 				if (!string.IsNullOrEmpty (DebuggerHosts))
@@ -83,9 +82,9 @@ public override bool Execute ()
 					Log.LogError (7002, null, MSBStrings.E7002);
 					return false;
 				}
-			}
 
-			DebugIPAddresses = string.Join (";", ips.ToArray ());
+				DebugIPAddresses = string.Join (";", ips);
+			}
 
 			Log.LogTaskProperty ("DebugIPAddresses", DebugIPAddresses);
 
diff --git a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.Common.targets b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.Common.targets
index 89a5d6219387..a17d5b78b1c1 100644
--- a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.Common.targets
+++ b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.Common.targets
@@ -899,7 +899,7 @@ Copyright (C) 2013-2016 Xamarin. All rights reserved.
 		</EmbedMobileProvision>
 	</Target>
 
-	<Target Name="_DetectDebugNetworkConfiguration">
+	<Target Name="_DetectDebugNetworkConfiguration" Condition="'$(_BundlerDebug)' == 'true'">
 		<DetectDebugNetworkConfiguration
 			SessionId="$(BuildSessionId)"
 			Condition="'$(IsMacEnabled)' == 'true'"