diff --git a/conman.c b/conman.c
index f0c261ba..c7661443 100644
--- a/conman.c
+++ b/conman.c
@@ -660,6 +660,10 @@ static void writeToLogFiles(SConnection *self, char *buffer)
         return 0;
       }
 
+      if (buffer[0] == '\0' && iOut == eFinish) {
+        return 1; /* do not write empty line */
+      }
+
      /* log it for any case */
        if(self->pSock)
        { 
@@ -715,6 +719,10 @@ static void writeToLogFiles(SConnection *self, char *buffer)
         return 0;
       }
 
+      if (buffer[0] == '\0' && iOut == eFinish) {
+        return 1; /* do not write empty line */
+      }
+
      /* log it for any case */
        if(self->pSock)
        {