diff --git a/Dockerfile b/Dockerfile
index 45823b311..35545802b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,7 +16,7 @@ RUN apt-get update \
     && apt-get update \
     && apt-get install -y transmission-cli transmission-common transmission-daemon \
     && apt-get install -y openvpn curl rar unrar zip unzip wget \
-    && apt-get install -y tinyproxy telnet\
+    && apt-get install -y tinyproxy telnet \
     && curl -sLO https://github.com/Yelp/dumb-init/releases/download/v1.0.1/dumb-init_1.0.1_amd64.deb \
     && dpkg -i dumb-init_*.deb \
     && rm -rf dumb-init_*.deb \
diff --git a/docker-compose-armhf.yml b/docker-compose-armhf.yml
index e1de87725..4192916ed 100644
--- a/docker-compose-armhf.yml
+++ b/docker-compose-armhf.yml
@@ -26,8 +26,6 @@ services:
     - OPENVPN_PASSWORD=password
     - OPENVPN_OPTS=--inactive 3600 --ping 10 --ping-exit 60
     - LOCAL_NETWORK=192.168.0.0/24
-    - WEBPROXY_ENABLED=true
-    - WEBPROXY_PORT=8888
  proxy:
   build:
      context: ./proxy
diff --git a/docker-compose.yml b/docker-compose.yml
index 9b4e4b748..d950eb203 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,8 +22,6 @@ services:
     - OPENVPN_PASSWORD=password
     - OPENVPN_OPTS="--inactive 3600 --ping 10 --ping-exit 60"
     - LOCAL_NETWORK=192.168.0.0/24
-    - WEBPROXY_ENABLED=true
-    - WEBPROXY_PORT=8888
  proxy:
   image: haugene/transmission-openvpn-proxy
   links:
diff --git a/openvpn/tunnelDown.sh b/openvpn/tunnelDown.sh
index b6a7f4ad4..371aa024d 100755
--- a/openvpn/tunnelDown.sh
+++ b/openvpn/tunnelDown.sh
@@ -1,3 +1,4 @@
 #!/bin/sh
 
 /etc/transmission/stop.sh
+/opt/tinyproxy/stop.sh
diff --git a/openvpn/tunnelUp.sh b/openvpn/tunnelUp.sh
index a7fb03ade..5b238ddc2 100755
--- a/openvpn/tunnelUp.sh
+++ b/openvpn/tunnelUp.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 /etc/transmission/start.sh
-/etc/tinyproxy/start.sh
+/opt/tinyproxy/start.sh
diff --git a/tinyproxy/stop.sh b/tinyproxy/stop.sh
new file mode 100755
index 000000000..12677c38e
--- /dev/null
+++ b/tinyproxy/stop.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+if [ "${WEBPROXY_ENABLED}" = "true" ]; then
+
+  /etc/init.d/tinyproxy stop
+
+fi