diff --git a/go/master/c/client.go b/go/master/c/client.go
index 79e13e4b63b898fc8c6680cb5e1ea271a0f0e72f..a37894fefecab86d6cc0ef862d1d8b7d8009aa9a 100644
--- a/go/master/c/client.go
+++ b/go/master/c/client.go
@@ -13,7 +13,6 @@ typedef int paddle_master_client;
 import "C"
 
 import (
-	"io"
 	"sync"
 	"unsafe"
 
@@ -93,12 +92,6 @@ func paddle_set_dataset(client C.paddle_master_client, path **C.char, size C.int
 func paddle_next_record(client C.paddle_master_client, record **C.uchar) C.int {
 	c := get(client)
 	r, err := c.NextRecord()
-	if err == io.EOF {
-		// EOF
-		*record = (*C.uchar)(nullPtr)
-		return -1
-	}
-
 	if err != nil {
 		// Error
 		// TODO: return the type of error?
diff --git a/go/master/client.go b/go/master/client.go
index c122d17c8fe5db5eaa5393e4d84bb0c8b318f8ab..985b96b0af4103beef9045db318fd6d3fe32a233 100644
--- a/go/master/client.go
+++ b/go/master/client.go
@@ -1,7 +1,6 @@
 package master
 
 import (
-	"io"
 	"os"
 	"time"
 
@@ -70,8 +69,6 @@ func (c *Client) getRecords() {
 			if err != nil {
 				log.Errorln(err)
 			}
-
-			c.ch <- record{nil, io.EOF}
 		}
 
 		// We treat a task as finished whenever the last data
diff --git a/go/master/client_test.go b/go/master/client_test.go
index 05201941e363ba347d905ed3d410b7d52f67f3c2..0a401d8a43c7616e7052f8cb15709b411e18755a 100644
--- a/go/master/client_test.go
+++ b/go/master/client_test.go
@@ -2,7 +2,6 @@ package master_test
 
 import (
 	"fmt"
-	"io"
 	"net"
 	"net/http"
 	"net/rpc"
@@ -70,12 +69,8 @@ func TestNextRecord(t *testing.T) {
 
 	for pass := 0; pass < 50; pass++ {
 		received := make(map[byte]bool)
-		for i := 0; i <= total; i++ {
+		for i := 0; i < total; i++ {
 			r, err := c.NextRecord()
-			if err == io.EOF {
-				break
-			}
-
 			if err != nil {
 				t.Fatal(pass, i, "Read error:", err)
 			}
diff --git a/python/paddle/v2/master/client.py b/python/paddle/v2/master/client.py
index 0cc01b73104aac2fa8043e37933f269f2db74c79..6ddb09e4e8947019422056153809a79cdd12455c 100644
--- a/python/paddle/v2/master/client.py
+++ b/python/paddle/v2/master/client.py
@@ -28,16 +28,11 @@ class client(object):
 
     # return format: (record, errno)
     # errno =  0: ok
-    #       = -1: EOF
     #       < -1: error
     def next_record(self):
         p = ctypes.c_char_p()
         ret = ctypes.pointer(p)
         size = lib.paddle_next_record(self.c, ret)
-        if size == -1:
-            # EOF
-            return None, -1
-
         if size < -1:
             # Error
             return None, size