diff --git a/whipper/command/cd.py b/whipper/command/cd.py
index f32c115e..d8dad420 100644
--- a/whipper/command/cd.py
+++ b/whipper/command/cd.py
@@ -186,7 +186,8 @@ def do(self):
 
         self.doCommand()
 
-        if self.options.eject in ('success', 'always'):
+        if (self.options.eject == 'success' and self.eject or
+                self.options.eject == 'always'):
             utils.eject_device(self.device)
 
         return None