diff --git a/cpp/piscsi/piscsi_executor.cpp b/cpp/piscsi/piscsi_executor.cpp
index 319623eb..ace9cb2b 100644
--- a/cpp/piscsi/piscsi_executor.cpp
+++ b/cpp/piscsi/piscsi_executor.cpp
@@ -126,7 +126,8 @@ bool PiscsiExecutor::ProcessCmd(const CommandContext& context)
 		return false;
 	}
 
-	return context.ReturnSuccessStatus();
+            // ATTACH and DETACH are special cases because they return the current device list
+    return command.operation() == ATTACH || command.operation() == DETACH ? true : context.ReturnSuccessStatus();
 }
 
 bool PiscsiExecutor::Start(PrimaryDevice& device, bool dryRun) const