diff --git a/lib/nerves_hub/devices/filtering.ex b/lib/nerves_hub/devices/filtering.ex
index 13625e962..40e83486d 100644
--- a/lib/nerves_hub/devices/filtering.ex
+++ b/lib/nerves_hub/devices/filtering.ex
@@ -83,6 +83,12 @@ defmodule NervesHub.Devices.Filtering do
     where(query, [d], ilike(d.identifier, ^"%#{value}%"))
   end
 
+  def filter(query, _filters, :deployment_id, nil), do: query
+
+  def filter(query, _filters, :deployment_id, value) do
+    where(query, [d], d.deployment_id == ^value)
+  end
+
   def filter(query, _filters, :tag, value) do
     build_tag_filter(query, value)
   end
diff --git a/lib/nerves_hub_web/live/devices/index-new.html.heex b/lib/nerves_hub_web/live/devices/index-new.html.heex
index a1fe7344d..137716369 100644
--- a/lib/nerves_hub_web/live/devices/index-new.html.heex
+++ b/lib/nerves_hub_web/live/devices/index-new.html.heex
@@ -331,6 +331,15 @@
               <option {selected?(@current_filters, :connection_type, "wifi")} value="wifi">WiFi</option>
             </select>
           </div>
+          <div class="mt-6">
+            <label class="sidebar-label" for="deployment_id">Deployment</label>
+            <select class="sidebar-select" name="deployment_id" id="deployment_id">
+              <option {selected?(@current_filters, :deployment_id, "")} value="">All</option>
+              <%= for deployment <- @deployments do %>
+                <option {selected?(@current_filters, :deployment_id, deployment.id)} value={deployment.id}>{deployment.name}</option>
+              <% end %>
+            </select>
+          </div>
           <div class="mt-6">
             <label class="sidebar-label" for="input_health">Firmware Updates</label>
             <select class="sidebar-select" name="updates" id="input_health">
diff --git a/lib/nerves_hub_web/live/devices/index.ex b/lib/nerves_hub_web/live/devices/index.ex
index 942d3d2da..33f38240b 100644
--- a/lib/nerves_hub_web/live/devices/index.ex
+++ b/lib/nerves_hub_web/live/devices/index.ex
@@ -40,7 +40,8 @@ defmodule NervesHubWeb.Live.Devices.Index do
     alarm: "",
     metrics_key: "",
     metrics_operator: "gt",
-    metrics_value: ""
+    metrics_value: "",
+    deployment_id: nil
   }
 
   @filter_types %{
@@ -58,7 +59,8 @@ defmodule NervesHubWeb.Live.Devices.Index do
     alarm: :string,
     metrics_key: :string,
     metrics_operator: :string,
-    metrics_value: :string
+    metrics_value: :string,
+    deployment_id: :integer
   }
 
   @default_page 1
diff --git a/lib/nerves_hub_web/live/devices/index.html.heex b/lib/nerves_hub_web/live/devices/index.html.heex
index 76e8a0a48..1a63cc665 100644
--- a/lib/nerves_hub_web/live/devices/index.html.heex
+++ b/lib/nerves_hub_web/live/devices/index.html.heex
@@ -82,6 +82,15 @@
             <div class="select-icon"></div>
           </div>
         </div>
+        <div class="form-group">
+          <label for="deployment_id">Deployment</label>
+          <select name="deployment_id" id="deployment_id" class="form-control">
+            <option {selected?(@current_filters, :deployment_id, "")} value="">All</option>
+            <%= for deployment <- @deployments do %>
+              <option {selected?(@current_filters, :deployment_id, deployment.id)} value={deployment.id}>{deployment.name}</option>
+            <% end %>
+          </select>
+        </div>
         <div class="form-group">
           <label for="input_health">Firmware Updates</label>
           <div class="pos-rel">
diff --git a/test/nerves_hub_web/live/devices/index_test.exs b/test/nerves_hub_web/live/devices/index_test.exs
index 6eb83d7ee..b62efde1e 100644
--- a/test/nerves_hub_web/live/devices/index_test.exs
+++ b/test/nerves_hub_web/live/devices/index_test.exs
@@ -232,6 +232,22 @@ defmodule NervesHubWeb.Live.Devices.IndexTest do
       assert change =~ "1 devices found"
     end
 
+    test "filters devices by deployment_id", %{conn: conn, fixture: fixture} do
+      %{device: device, firmware: firmware, org: org, product: product, deployment: deployment} =
+        fixture
+
+      device2 = Fixtures.device_fixture(org, product, firmware)
+
+      Repo.update!(Ecto.Changeset.change(device, deployment_id: deployment.id))
+
+      {:ok, view, _html} = live(conn, device_index_path(fixture))
+
+      change = render_change(view, "update-filters", %{"deployment_id" => deployment.id})
+      assert change =~ device.identifier
+      refute change =~ device2.identifier
+      assert change =~ "1 devices found"
+    end
+
     test "select device", %{conn: conn, fixture: fixture} do
       %{device: _device, firmware: firmware, org: org, product: product} = fixture