diff --git a/miio/vacuum.py b/miio/vacuum.py
index 734c10ebf..6a7e9eced 100644
--- a/miio/vacuum.py
+++ b/miio/vacuum.py
@@ -419,7 +419,7 @@ def callback(ctx, *args, id_file, **kwargs):
 
         @dg.resultcallback()
         @dg.device_pass
-        def cleanup(vac: Vacuum, **kwargs):
+        def cleanup(vac: Vacuum, *args, **kwargs):
             if vac.ip is None:  # dummy Device for discovery, skip teardown
                 return
             id_file = kwargs['id_file']
diff --git a/miio/vacuum_cli.py b/miio/vacuum_cli.py
index 8bf375b2a..29f313a34 100644
--- a/miio/vacuum_cli.py
+++ b/miio/vacuum_cli.py
@@ -73,7 +73,7 @@ def cli(ctx, ip: str, token: str, debug: int, id_file: str):
 
 @cli.resultcallback()
 @pass_dev
-def cleanup(vac: miio.Vacuum, **kwargs):
+def cleanup(vac: miio.Vacuum, *args, **kwargs):
     if vac.ip is None:  # dummy Device for discovery, skip teardown
         return
     id_file = kwargs['id_file']