diff --git a/libraries/MySensors/core/MyMessage.cpp b/libraries/MySensors/core/MyMessage.cpp
index a0f32f5..117dfe3 100644
--- a/libraries/MySensors/core/MyMessage.cpp
+++ b/libraries/MySensors/core/MyMessage.cpp
@@ -203,10 +203,11 @@ MyMessage& MyMessage::set(const char* value) {
 	uint8_t length = value == NULL ? 0 : min(strlen(value), MAX_PAYLOAD);
 	miSetLength(length);
 	miSetPayloadType(P_STRING);
-	if (length)
+	if (length) {		
 		strncpy(data, value, length);
-	else
-		data[0] ='\0';
+	}
+	// null terminate string
+	data[length] = 0;
 	return *this;
 }