diff --git a/lib/db/api.js b/lib/db/api.js
index 9a90c7e9..2426ad4a 100644
--- a/lib/db/api.js
+++ b/lib/db/api.js
@@ -35,14 +35,16 @@ dbapi.loadUser = function(email) {
 
 dbapi.addUserForward = function(email, forward) {
   return db.run(r.table('users').get(email).update({
-    forwards: r.row('forwards').default([]).append(forward)
+    forwards: r.row('forwards').default([]).filter(function(forward) {
+      return forward('devicePort').ne(devicePort)
+    }).append(forward)
   }))
 }
 
 dbapi.removeUserForward = function(email, devicePort) {
   return db.run(r.table('users').get(email).update({
     forwards: r.row('forwards').default([]).filter(function(forward) {
-      return forward('devicePort').eq(devicePort)
+      return forward('devicePort').ne(devicePort)
     })
   }))
 }