diff --git a/builtin/providers/vsphere/resource_vsphere_virtual_machine.go b/builtin/providers/vsphere/resource_vsphere_virtual_machine.go
index 84e1cef8c141..9c8c25678c38 100644
--- a/builtin/providers/vsphere/resource_vsphere_virtual_machine.go
+++ b/builtin/providers/vsphere/resource_vsphere_virtual_machine.go
@@ -422,7 +422,7 @@ func resourceVSphereVirtualMachineCreate(d *schema.ResourceData, meta interface{
 		}
 	}
 
-	if _, ok := d.GetOk("network_interface.0.ipv4_address"); !ok {
+	if ip, ok := d.GetOk("network_interface.0.ipv4_address"); !ok {
 		if v, ok := d.GetOk("boot_delay"); ok {
 			stateConf := &resource.StateChangeConf{
 				Pending:    []string{"pending"},
@@ -438,6 +438,10 @@ func resourceVSphereVirtualMachineCreate(d *schema.ResourceData, meta interface{
 				return err
 			}
 		}
+	} else {
+		d.SetConnInfo(map[string]string{
+			"host": ip.(string),
+		})
 	}
 	d.SetId(vm.Path())
 	log.Printf("[INFO] Created virtual machine: %s", d.Id())