diff --git a/Network.cpp b/Network.cpp
index ef3db91..1924cf1 100644
--- a/Network.cpp
+++ b/Network.cpp
@@ -148,7 +148,7 @@ void Network::update()
         }
     }
 
-    if(_presenceCsv != nullptr)
+    if(_presenceCsv != nullptr && strlen(_presenceCsv) > 0)
     {
         publishString(mqtt_topic_presence, _presenceCsv);
         _presenceCsv = nullptr;
diff --git a/PresenceDetection.cpp b/PresenceDetection.cpp
index 703dc19..7a0a4c2 100644
--- a/PresenceDetection.cpp
+++ b/PresenceDetection.cpp
@@ -46,6 +46,8 @@ void PresenceDetection::update()
         }
     }
 
+    _csv[_csvIndex-1] = 0x00;
+
     _network->publishPresenceDetection(_csv);
 }