diff --git a/xos/synchronizers/vcpe/templates/bwlimit.sh.j2 b/xos/synchronizers/vcpe/templates/bwlimit.sh.j2
index ee036e5..2e3852c 100644
--- a/xos/synchronizers/vcpe/templates/bwlimit.sh.j2
+++ b/xos/synchronizers/vcpe/templates/bwlimit.sh.j2
@@ -22,6 +22,9 @@
 DNLD={{ downlink_speed }}          # DOWNLOAD Limit
 UPLD={{ uplink_speed }}            # UPLOAD Limit
 
+[ "$DNLD" == "None"] && DNLD=$MAXRATE
+[ "$UPLD" == "None"] && UPLD=$MAXRATE
+
 start() {
 
 # We'll use Hierarchical Token Bucket (HTB) to shape bandwidth.
@@ -52,7 +55,7 @@
     $TC class add dev $LAN parent 1:1 classid 1:30 htb rate 1kbit ceil $DNLD burst 15k
     $TC qdisc add dev $LAN parent 1:30 handle 30: sfq perturb 10
 
-    # This class is exempt from the download limit 
+    # This class is exempt from the download limit
     $TC class add dev $LAN parent 1:1 classid 1:50 htb rate 1kbit ceil $MAXRATE burst 15k
     $TC qdisc add dev $LAN parent 1:50 handle 50: sfq perturb 10