diff --git a/facedancer/filters/standard.py b/facedancer/filters/standard.py
index 35ea1263..65dceb8c 100644
--- a/facedancer/filters/standard.py
+++ b/facedancer/filters/standard.py
@@ -67,7 +67,8 @@ def filter_control_out(self, req, data):
         # handle it ourself, and absorb it.
         if req.get_recipient() == self.RECIPIENT_DEVICE and \
            req.request == self.SET_ADDRESS_REQUEST:
-            self.device.handle_set_address_request(req)
+            req.acknowledge(blocking=True)
+            self.device.set_address(req.value)
             return None, None
 
         # Special case: if this is a SET_CONFIGURATION_REQUEST,