diff --git a/run.py b/run.py
index 99887b9..2306b1c 100755
--- a/run.py
+++ b/run.py
@@ -1120,7 +1120,7 @@ def setup_client(pool):
     # Windows client setup
     from subprocess import PIPE
     fprint("Running full jukebox control system...")
-    jb = subprocess.Popen("ssh root@192.168.1.25 -- /root/jukebox-software/run.sh".split(' '), stdout=PIPE, stderr=PIPE)
+    jb = subprocess.Popen("ssh root@192.168.1.25 -- /root/jukebox-software/run.sh".split(' '), stdout=PIPE, stderr=PIPE, bufsize=1, universal_newlines=True)
     for line in jb.stdout:
         print(line, end='')
         if line.find("Running mode: Idle") > 0:
@@ -1138,8 +1138,10 @@ def setup_client(pool):
 
     firefox.get('http://192.168.1.25:3000')
     global kill_ssh
-    while kill_ssh is False:
-        sleep(0.1)
+    for line in jb.stdout:
+        print(line, end='')
+        if kill_ssh is True:
+            break
         
     firefox.close()
     jb.terminate()