diff --git a/helios-services/src/main/java/com/spotify/helios/master/ZooKeeperMasterModel.java b/helios-services/src/main/java/com/spotify/helios/master/ZooKeeperMasterModel.java
index 27bf0d2ad..cda9a4c74 100644
--- a/helios-services/src/main/java/com/spotify/helios/master/ZooKeeperMasterModel.java
+++ b/helios-services/src/main/java/com/spotify/helios/master/ZooKeeperMasterModel.java
@@ -1562,7 +1562,7 @@ private void deployJobRetry(final ZooKeeperClient client, final String host,
     final String taskPath = Paths.configHostJob(host, id);
     final String taskCreationPath = Paths.configHostJobCreation(host, id, operationId);
 
-    final List<Integer> staticPorts = staticPorts(job);
+    final Set<Integer> staticPorts = staticPorts(job);
     final Map<String, byte[]> portNodes = Maps.newHashMap();
     final byte[] idJson = id.toJsonBytes();
     for (final int port : staticPorts) {
@@ -1643,8 +1643,8 @@ private void assertJobExists(final ZooKeeperClient client, final JobId id)
     }
   }
 
-  private List<Integer> staticPorts(final Job job) {
-    final List<Integer> staticPorts = Lists.newArrayList();
+  private Set<Integer> staticPorts(final Job job) {
+    final Set<Integer> staticPorts = Sets.newHashSet();
     for (final PortMapping portMapping : job.getPorts().values()) {
       if (portMapping.getExternalPort() != null) {
         staticPorts.add(portMapping.getExternalPort());
@@ -1951,7 +1951,7 @@ public Deployment undeployJob(final String host, final JobId jobId, final String
       final List<String> nodes = newArrayList(reverse(client.listRecursive(configHostJobPath)));
       nodes.add(Paths.configJobHost(jobId, host));
 
-      final List<Integer> staticPorts = staticPorts(job);
+      final Set<Integer> staticPorts = staticPorts(job);
       for (final int port : staticPorts) {
         nodes.add(Paths.configHostPort(host, port));
       }
@@ -1990,7 +1990,7 @@ private List<ZooKeeperOperation> getUndeployOperations(final ZooKeeperClient cli
       final List<String> nodes = newArrayList(reverse(client.listRecursive(configHostJobPath)));
       nodes.add(Paths.configJobHost(jobId, host));
 
-      final List<Integer> staticPorts = staticPorts(job);
+      final Set<Integer> staticPorts = staticPorts(job);
       for (final int port : staticPorts) {
         nodes.add(Paths.configHostPort(host, port));
       }
@@ -2027,7 +2027,7 @@ private List<ZooKeeperOperation> getDeployOperations(final ZooKeeperClient clien
     final String taskPath = Paths.configHostJob(host, id);
     final String taskCreationPath = Paths.configHostJobCreation(host, id, operationId);
 
-    final List<Integer> staticPorts = staticPorts(job);
+    final Set<Integer> staticPorts = staticPorts(job);
     final Map<String, byte[]> portNodes = Maps.newHashMap();
     final byte[] idJson = id.toJsonBytes();
     for (final int port : staticPorts) {