diff --git a/hassio/core.py b/hassio/core.py
index 6a74386cc..f21e9daf0 100644
--- a/hassio/core.py
+++ b/hassio/core.py
@@ -96,7 +96,7 @@ class HassIO(object):
             now=True)
 
         # Load homeassistant
-        await self.homeassistant.prepare():
+        await self.homeassistant.prepare()
 
         # Load addons
         await self.addons.prepare()
diff --git a/hassio/dock/__init__.py b/hassio/dock/__init__.py
index 733bbce67..7fb7adb4d 100644
--- a/hassio/dock/__init__.py
+++ b/hassio/dock/__init__.py
@@ -260,9 +260,13 @@ class DockerBase(object):
         if not self._install(tag):
             return False
 
-        # cleanup old stuff
+        # run or cleanup container
         if was_running:
             self._run()
+        else:
+            self._stop()
+
+        # cleanup images
         self._cleanup()
 
         return True