diff --git a/clientv3/op.go b/clientv3/op.go
index 135ff6751..0f20db5df 100644
--- a/clientv3/op.go
+++ b/clientv3/op.go
@@ -28,6 +28,10 @@ const (
 	tDeleteRange
 )
 
+var (
+	noPrefixEnd = []byte{0}
+)
+
 // Op represents an Operation that kv can execute.
 type Op struct {
 	t   opType
@@ -175,8 +179,7 @@ func getPrefix(key []byte) []byte {
 	}
 	// next prefix does not exist (e.g., 0xffff);
 	// default to WithFromKey policy
-	end = []byte{0}
-	return end
+	return noPrefixEnd
 }
 
 // WithPrefix enables 'Get', 'Delete', or 'Watch' requests to operate
diff --git a/etcdserver/api/v3rpc/watch.go b/etcdserver/api/v3rpc/watch.go
index 55e5dbfe4..e88e0793b 100644
--- a/etcdserver/api/v3rpc/watch.go
+++ b/etcdserver/api/v3rpc/watch.go
@@ -111,6 +111,10 @@ func (sws *serverWatchStream) recvLoop() error {
 			}
 
 			creq := uv.CreateRequest
+			if len(creq.Key) == 0 {
+				// \x00 is the smallest key
+				creq.Key = []byte{0}
+			}
 			if len(creq.RangeEnd) == 1 && creq.RangeEnd[0] == 0 {
 				// support  >= key queries
 				creq.RangeEnd = []byte{}