diff --git a/api/bandwidth.go b/api/bandwidth.go
index 16e0950..683dbac 100644
--- a/api/bandwidth.go
+++ b/api/bandwidth.go
@@ -56,10 +56,8 @@ func (b Bandwidth) String() string {
 		return formatWithRemainder(b.Bits(), Megabit.Bits(), "Mbps")
 	} else if b >= Kilobit {
 		return formatWithRemainder(b.Bits(), Kilobit.Bits(), "Kbps")
-	} else if b > 0 {
-		return fmt.Sprintf("%d bps", b)
 	} else {
-		return "unlimited"
+		return fmt.Sprintf("%d bps", b)
 	}
 }
 
diff --git a/api/bandwidth_test.go b/api/bandwidth_test.go
index a5023e8..5cdb427 100644
--- a/api/bandwidth_test.go
+++ b/api/bandwidth_test.go
@@ -67,7 +67,7 @@ func TestBandwidthString(t *testing.T) {
 	}{
 		{
 			0,
-			"unlimited",
+			"0 bps",
 		},
 		{
 			BandwidthFromBits(123),
diff --git a/proxy/proxy_server.go b/proxy/proxy_server.go
index e5ac742..ad932db 100644
--- a/proxy/proxy_server.go
+++ b/proxy/proxy_server.go
@@ -195,14 +195,22 @@ func getTargetBandwidths(config *goconf.ConfigFile) (api.Bandwidth, api.Bandwidt
 		maxIncomingValue = 0
 	}
 	maxIncoming := api.BandwidthFromMegabits(uint64(maxIncomingValue))
-	log.Printf("Target bandwidth for incoming streams: %s", maxIncoming)
+	if maxIncoming > 0 {
+		log.Printf("Target bandwidth for incoming streams: %s", maxIncoming)
+	} else {
+		log.Printf("Target bandwidth for incoming streams: unlimited")
+	}
 
 	maxOutgoingValue, _ := config.GetInt("bandwidth", "outgoing")
 	if maxOutgoingValue < 0 {
 		maxOutgoingValue = 0
 	}
 	maxOutgoing := api.BandwidthFromMegabits(uint64(maxOutgoingValue))
-	log.Printf("Target bandwidth for outgoing streams: %s", maxOutgoing)
+	if maxOutgoing > 0 {
+		log.Printf("Target bandwidth for outgoing streams: %s", maxOutgoing)
+	} else {
+		log.Printf("Target bandwidth for outgoing streams: unlimited")
+	}
 
 	return maxIncoming, maxOutgoing
 }