diff --git a/cmd/serverFunc.go b/cmd/serverFunc.go
index 75c569b..44857a8 100644
--- a/cmd/serverFunc.go
+++ b/cmd/serverFunc.go
@@ -132,10 +132,18 @@ func populateChat(conn net.Conn) {
 	}
 	defer file.Close()
 	scanner := bufio.NewScanner(file)
-	for scanner.Scan() {
-		conn.Write([]byte(fmt.Sprintln(scanner.Text())))
+	// For WHATEVER reason, writing to a TLS-based conn here appends newlines by default,
+	// so we have to split it off here to avoid ending up with chat logs full of
+	// unnecessary newlines
+	if servInsecure == true {
+		for scanner.Scan() {
+			conn.Write([]byte(fmt.Sprintln(scanner.Text())))
+		}
+	} else {
+		for scanner.Scan() {
+			conn.Write([]byte(fmt.Sprint(scanner.Text())))
+		}
 	}
-
 }
 
 func getPasswd(conn net.Conn) error {