diff --git a/netbox/templates/virtualization/cluster_add_devices.html b/netbox/templates/virtualization/cluster_add_devices.html
index 397f53d01..d53fc3a03 100644
--- a/netbox/templates/virtualization/cluster_add_devices.html
+++ b/netbox/templates/virtualization/cluster_add_devices.html
@@ -35,33 +35,3 @@
         </div>
     </form>
 {% endblock %}
-
-{% block javascript %}
-<script type="text/javascript">
-    $(document).ready(function() {
-        var device_list = $('#id_devices');
-        var disabled_indicator = device_list.attr('disabled-indicator');
-        $('#id_search').autocomplete({
-            source: function(request, response) {
-                $.ajax({
-                    type: 'GET',
-                    url: netbox_api_path + 'dcim/devices/',
-                    data: 'q=' + request.term,
-                    beforeSend: function() {
-                        device_list.empty();
-                    },
-                    success: function(data) {
-                        response($.map(data.results, function(item) {
-                            var option = $("<option></option>").attr("value", item['id']).text(item['display_name']);
-                            if (disabled_indicator && item[disabled_indicator]) {
-                                option.attr("disabled", "disabled");
-                            }
-                            device_list.append(option);
-                        }));
-                    }
-                });
-            }
-        });
-    });
-</script>
-{% endblock %}
diff --git a/netbox/virtualization/forms.py b/netbox/virtualization/forms.py
index b05dbb476..9bf55e497 100644
--- a/netbox/virtualization/forms.py
+++ b/netbox/virtualization/forms.py
@@ -225,11 +225,11 @@ class ClusterAddDevicesForm(BootstrapMixin, forms.Form):
         )
     )
     devices = DynamicModelMultipleChoiceField(
-        queryset=Device.objects.filter(cluster__isnull=True),
+        queryset=Device.objects.all(),
         display_field='display_name',
-        widget=APISelectMultiple(
-            disabled_indicator='cluster'
-        )
+        query_params={
+            'cluster_id': 'null'
+        }
     )
 
     class Meta: