diff --git a/internal/core/command/controller/messaging/utils.go b/internal/core/command/controller/messaging/utils.go
index f65ea41ea3..204dd1088c 100644
--- a/internal/core/command/controller/messaging/utils.go
+++ b/internal/core/command/controller/messaging/utils.go
@@ -95,7 +95,7 @@ func getCommandQueryResponseEnvelope(requestEnvelope types.MessageEnvelope, devi
 		commandsResponse = responses.NewMultiDeviceCoreCommandsResponse(requestEnvelope.RequestID, "", http.StatusOK, totalCounts, commands)
 	default:
 		commands, edgexError := application.CommandsByDeviceName(deviceName, dic)
-		if err != nil {
+		if edgexError != nil {
 			return types.MessageEnvelope{}, fmt.Errorf("failed to get commands by device name '%s': %s", deviceName, edgexError.Error())
 		}