diff --git a/resource/template/theme-angel-kanade/home.html b/resource/template/theme-angel-kanade/home.html
index 1e53517..7dde05e 100644
--- a/resource/template/theme-angel-kanade/home.html
+++ b/resource/template/theme-angel-kanade/home.html
@@ -24,7 +24,9 @@
                   [<span
                     v-if="server.Host.Virtualization">@#server.Host.Virtualization#@:</span>@#server.Host.Arch#@]<br />
                   CPU: @#server.Host.CPU#@<br />
-                  GPU: @#server.Host.GPU#@<br />
+                  <template v-if="server.Host.GPU">
+                      GPU: @#server.Host.GPU#@
+                  </template>
                   {{tr "DiskUsed"}}:
                   @#formatByteSize(server.State.DiskUsed)#@/@#formatByteSize(server.Host.DiskTotal)#@<br />
                   {{tr "MemUsed"}}:
diff --git a/resource/template/theme-default/home.html b/resource/template/theme-default/home.html
index 5f1758e..3f8602e 100644
--- a/resource/template/theme-default/home.html
+++ b/resource/template/theme-default/home.html
@@ -28,8 +28,10 @@
                                         <br />
                                         CPU: @#server.Host.CPU#@
                                         <br />
-                                        GPU: @#server.Host.GPU#@
-                                        <br />
+                                        <template v-if="server.Host.GPU">
+                                            GPU: @#server.Host.GPU#@
+                                            <br />
+                                        </template>
                                         {{tr "DiskUsed"}}:
                                         @#formatByteSize(server.State.DiskUsed)#@/@#formatByteSize(server.Host.DiskTotal)#@
                                         <br />
diff --git a/resource/template/theme-server-status/home-group-false.html b/resource/template/theme-server-status/home-group-false.html
index ea29396..0c5701a 100644
--- a/resource/template/theme-server-status/home-group-false.html
+++ b/resource/template/theme-server-status/home-group-false.html
@@ -75,7 +75,8 @@
                         </span>
                         <span class="node-cell-expand" v-if="node.host.GPU">
                             <span class="node-cell-expand-label">GPU:</span>
-                            @#node.host.GPU.join(",")#@ (@#node.gpu.percent#@%)
+                            @#node.host.GPU.join(",")#@ 
+                            (@#parseInt(node.state.GPU >=0 ? node.state.GPU : 0)#@%)
                         </span>
                         <span class="node-cell-expand">
                             <span class="node-cell-expand-label">{{tr "DiskUsed"}}:</span>
diff --git a/resource/template/theme-server-status/home-group-true.html b/resource/template/theme-server-status/home-group-true.html
index da53ae8..03d98ff 100644
--- a/resource/template/theme-server-status/home-group-true.html
+++ b/resource/template/theme-server-status/home-group-true.html
@@ -78,7 +78,8 @@
                         </span>
                         <span class="node-cell-expand" v-if="node.host.GPU">
                             <span class="node-cell-expand-label">GPU:</span>
-                            @#node.host.GPU.join(",")#@ (@#node.gpu.percent#@%)
+                            @#node.host.GPU.join(",")#@ 
+                            (@#parseInt(node.state.GPU >=0 ? node.state.GPU : 0)#@%)
                         </span>
                         <span class="node-cell-expand">
                             <span class="node-cell-expand-label">{{tr "DiskUsed"}}:</span>
diff --git a/resource/template/theme-server-status/home.html b/resource/template/theme-server-status/home.html
index 17c7084..df34b0b 100644
--- a/resource/template/theme-server-status/home.html
+++ b/resource/template/theme-server-status/home.html
@@ -396,7 +396,6 @@
                         network: this.getNetworkSpeed(server.State.NetInSpeed, server.State.NetOutSpeed),
                         traffic: this.formatByteSize(server.State.NetInTransfer) + ' | ' + this.formatByteSize(server.State.NetOutTransfer),
                         cpu: this.formatPercents(server.live, this.toFixed2(server.State.CPU)),
-                        gpu: this.formatPercents(server.live, this.toFixed2(server.State.GPU)),
                         memory: this.formatPercent(server.live, server.State.MemUsed, server.Host.MemTotal),
                         hdd: this.formatPercent(server.live, server.State.DiskUsed, server.Host.DiskTotal),
                         online: server.live,