diff --git a/downloadthread.cpp b/downloadthread.cpp
index 0685ff5..4917677 100644
--- a/downloadthread.cpp
+++ b/downloadthread.cpp
@@ -724,10 +724,10 @@ void DownloadThread::_writeComplete()
     _filename.replace("/dev/rdisk", "/dev/disk");
 #endif
 
-    if (_ejectEnabled && _config.isEmpty() && _cmdline.isEmpty())
+    if (_ejectEnabled && _config.isEmpty() && _cmdline.isEmpty() && _firstrun.isEmpty())
         eject_disk(_filename.constData());
 
-    if (!_config.isEmpty() || !_cmdline.isEmpty())
+    if (!_config.isEmpty() || !_cmdline.isEmpty() || !_firstrun.isEmpty())
     {
         if (!_customizeImage())
             return;