diff --git a/htdocs/openwebrx.js b/htdocs/openwebrx.js
index 979edf5..e71d0fe 100644
--- a/htdocs/openwebrx.js
+++ b/htdocs/openwebrx.js
@@ -1221,7 +1221,7 @@ function on_ws_recv(evt)
                     break;
                     case "cpuusage":
 						var server_cpu_usage = json.value;
-						progressbar_set(e("openwebrx-bar-server-cpu"),server_cpu_usage/100,"Server CPU [" + server_cpu_usage + "%]",server_cpu_usage>85);
+						progressbar_set(e("openwebrx-bar-server-cpu"),server_cpu_usage,"Server CPU [" + Math.round(server_cpu_usage * 100) + "%]",server_cpu_usage>85);
                     break;
                     case "clients":
                         var clients = json.value;
diff --git a/owrx/source.py b/owrx/source.py
index 4aa9bba..b8e7d12 100644
--- a/owrx/source.py
+++ b/owrx/source.py
@@ -452,8 +452,6 @@ class CpuUsageThread(threading.Thread):
                 c.write_cpu_usage(cpu_usage)
             time.sleep(3)
         logger.debug("cpu usage thread shut down")
-        if CpuUsageThread.sharedInstance == self:
-            CpuUsageThread.sharedInstance = None
 
     def get_cpu_usage(self):
         try:
@@ -486,6 +484,7 @@ class CpuUsageThread(threading.Thread):
             self.shutdown()
 
     def shutdown(self):
+        CpuUsageThread.sharedInstance = None
         self.doRun = False
 
 class ClientReportingThread(threading.Thread):