             @machine_list.register_machine_callbacks callbacks
 
         destroy: =>
-            machines.off()
-            @machine_list.off()
+            machines.off 'add', (machine) => @render() if machine.get('datacenter_uuid') is null
+            @machine_list.off 'size_changed', @ml_size_changed
 
     class @AddDatacenterModal extends UIComponents.AbstractModal
         template: Handlebars.compile $('#add_datacenter-modal-template').html()

            $(event.currentTarget).tooltip('show')

        destroy: =>
            @model.off()
            directory.off()

    # Datacenter list element
    class @DatacenterListElement extends UIComponents.CollapsibleListElement

            @bind_callbacks_to_machine machine_list_element for machine_list_element in @element_views

        bind_callbacks_to_machine: (machine_list_element) =>
            machine_list_element.off 'selected', @call_all_callback
            machine_list_element.on 'selected', @call_all_callback

        call_all_callback: =>
            callback() for callback in @callbacks

        destroy: ->
            machines.off 'change:datacenter_uuid', @changed_datacenter


    # Machine list element
