diff --git a/app/src/main/java/com/fongmi/android/tv/server/Nano.java b/app/src/main/java/com/fongmi/android/tv/server/Nano.java
index b4975adfe..ae6b66ed5 100644
--- a/app/src/main/java/com/fongmi/android/tv/server/Nano.java
+++ b/app/src/main/java/com/fongmi/android/tv/server/Nano.java
@@ -95,7 +95,7 @@ public class Nano extends NanoHTTPD {
     }
 
     private Response go() {
-        Server.get().go();
+        Go.start();
         return success();
     }
 
@@ -126,4 +126,10 @@ public class Nano extends NanoHTTPD {
             return newFixedLengthResponse(Response.Status.NOT_FOUND, MIME_HTML, null);
         }
     }
+
+    @Override
+    public void stop() {
+        super.stop();
+        Go.stop();
+    }
 }
diff --git a/app/src/main/java/com/fongmi/android/tv/server/Server.java b/app/src/main/java/com/fongmi/android/tv/server/Server.java
index 2a8d25b91..d9d5f78d5 100644
--- a/app/src/main/java/com/fongmi/android/tv/server/Server.java
+++ b/app/src/main/java/com/fongmi/android/tv/server/Server.java
@@ -36,10 +36,6 @@ public class Server {
         return "http://" + (local ? "127.0.0.1" : Util.getIp()) + ":" + getPort();
     }
 
-    public void go() {
-        Go.start();
-    }
-
     public void start() {
         if (nano != null) return;
         do {
@@ -59,6 +55,5 @@ public class Server {
     public void stop() {
         if (nano != null) nano.stop();
         nano = null;
-        Go.stop();
     }
 }