diff --git a/bacnet-stack/demo/handler/h_wpm.c b/bacnet-stack/demo/handler/h_wpm.c
index 630af1f6..ee47c1d1 100644
--- a/bacnet-stack/demo/handler/h_wpm.c
+++ b/bacnet-stack/demo/handler/h_wpm.c
@@ -121,6 +121,7 @@ void handler_write_property_multiple(
 #endif
                         if (Device_Write_Property(&wp_data) == false) {
                             error = true;
+                            len = BACNET_STATUS_ERROR;
                             goto WPM_ABORT;
                         }
                     } else {