diff --git a/qubes/storage/__init__.py b/qubes/storage/__init__.py
index f5126c5d..1f80c2bb 100644
--- a/qubes/storage/__init__.py
+++ b/qubes/storage/__init__.py
@@ -456,9 +456,8 @@ class Storage(object):
         # clone/import functions may be either synchronous or asynchronous
         # in the later case, we need to wait for them to finish
         if asyncio.iscoroutine(clone_op_ret):
-            self.vm.volumes[name] = yield from clone_op_ret
-        else:
-            self.vm.volumes[name] = clone_op_ret
+            clone_op_ret = yield from clone_op_ret
+        self.vm.volumes[name] = clone_op_ret
         return self.vm.volumes[name]
 
     @asyncio.coroutine