diff --git a/drivers/staging/greybus/operation.c b/drivers/staging/greybus/operation.c
index f194b1eeb539..17f4eab5c076 100644
--- a/drivers/staging/greybus/operation.c
+++ b/drivers/staging/greybus/operation.c
@@ -911,7 +911,8 @@ void gb_operation_cancel(struct gb_operation *operation, int errno)
 {
 	if (gb_operation_result_set(operation, errno)) {
 		gb_message_cancel(operation->request);
-		gb_message_cancel(operation->response);
+		if (operation->response)
+			gb_message_cancel(operation->response);
 	}
 	gb_operation_put(operation);
 }