diff --git a/labgrid/driver/usbstoragedriver.py b/labgrid/driver/usbstoragedriver.py
index 3207b787f..414528429 100644
--- a/labgrid/driver/usbstoragedriver.py
+++ b/labgrid/driver/usbstoragedriver.py
@@ -49,14 +49,21 @@ class USBStorageDriver(Driver):
     def __attrs_post_init__(self):
         super().__attrs_post_init__()
         self.wrapper = None
+        self.proxy = None
 
-    def on_activate(self):
+    def _start_wrapper(self):
+        if self.wrapper:
+            return
         host = self.storage.host if isinstance(self.storage, RemoteUSBResource) else None
         self.wrapper = AgentWrapper(host)
         self.proxy = self.wrapper.load('udisks2')
 
+    def on_activate(self):
+        pass
+
     def on_deactivate(self):
-        self.wrapper.close()
+        if self.wrapper:
+            self.wrapper.close()
         self.wrapper = None
         self.proxy = None
 
@@ -75,6 +82,8 @@ def write_files(self, sources, target, partition, target_is_directory=True):
             target_is_directory (bool): Whether target is a directory
         """
 
+        self._start_wrapper()
+
         self.devpath = self._get_devpath(partition)
         mount_path = self.proxy.mount(self.devpath)