diff --git a/matterbridge.go b/matterbridge.go
index 8a0dc766..4ca90dcf 100644
--- a/matterbridge.go
+++ b/matterbridge.go
@@ -83,7 +83,7 @@ func tableformatter (nicks_s string, nicksPerRow int) string {
 		nicksPerRow = 4
 	}
 	for i := 0; i < 2; i++ {
-		for j := 1; j <= nicksPerRow; j++ {
+		for j := 1; j <= nicksPerRow && j <= len(nicks); j++ {
 			if i == 0 {
 				result += "|"
 			} else {