diff --git a/node/rpcstack.go b/node/rpcstack.go
index 6d3828ec2b..baf660c6a3 100644
--- a/node/rpcstack.go
+++ b/node/rpcstack.go
@@ -77,11 +77,11 @@ type httpServer struct {
 	// HTTP RPC handler things.
 
 	httpConfig  httpConfig
-	httpHandler atomic.Value // *rpcHandler
+	httpHandler atomic.Pointer[rpcHandler]
 
 	// WebSocket handler things.
 	wsConfig  wsConfig
-	wsHandler atomic.Value // *rpcHandler
+	wsHandler atomic.Pointer[rpcHandler]
 
 	// These are set by setListenAddr.
 	endpoint string
@@ -97,9 +97,6 @@ const (
 
 func newHTTPServer(log log.Logger, timeouts rpc.HTTPTimeouts) *httpServer {
 	h := &httpServer{log: log, timeouts: timeouts, handlerNames: make(map[string]string)}
-
-	h.httpHandler.Store((*rpcHandler)(nil))
-	h.wsHandler.Store((*rpcHandler)(nil))
 	return h
 }
 
@@ -198,7 +195,7 @@ func (h *httpServer) start() error {
 
 func (h *httpServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	// check if ws request and serve if ws enabled
-	ws := h.wsHandler.Load().(*rpcHandler)
+	ws := h.wsHandler.Load()
 	if ws != nil && isWebsocket(r) {
 		if checkPath(r, h.wsConfig.prefix) {
 			ws.ServeHTTP(w, r)
@@ -207,7 +204,7 @@ func (h *httpServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	}
 
 	// if http-rpc is enabled, try to serve request
-	rpc := h.httpHandler.Load().(*rpcHandler)
+	rpc := h.httpHandler.Load()
 	if rpc != nil {
 		// First try to route in the mux.
 		// Requests to a path below root are handled by the mux,
@@ -267,14 +264,14 @@ func (h *httpServer) doStop() {
 	}
 
 	// Shut down the server.
-	httpHandler := h.httpHandler.Load().(*rpcHandler)
-	wsHandler := h.wsHandler.Load().(*rpcHandler)
+	httpHandler := h.httpHandler.Load()
+	wsHandler := h.wsHandler.Load()
 	if httpHandler != nil {
-		h.httpHandler.Store((*rpcHandler)(nil))
+		h.httpHandler.Store(nil)
 		httpHandler.server.Stop()
 	}
 	if wsHandler != nil {
-		h.wsHandler.Store((*rpcHandler)(nil))
+		h.wsHandler.Store(nil)
 		wsHandler.server.Stop()
 	}
 
@@ -322,9 +319,9 @@ func (h *httpServer) enableRPC(apis []rpc.API, config httpConfig) error {
 
 // disableRPC stops the HTTP RPC handler. This is internal, the caller must hold h.mu.
 func (h *httpServer) disableRPC() bool {
-	handler := h.httpHandler.Load().(*rpcHandler)
+	handler := h.httpHandler.Load()
 	if handler != nil {
-		h.httpHandler.Store((*rpcHandler)(nil))
+		h.httpHandler.Store(nil)
 		handler.server.Stop()
 	}
 	return handler != nil
@@ -369,9 +366,9 @@ func (h *httpServer) stopWS() {
 
 // disableWS disables the WebSocket handler. This is internal, the caller must hold h.mu.
 func (h *httpServer) disableWS() bool {
-	ws := h.wsHandler.Load().(*rpcHandler)
+	ws := h.wsHandler.Load()
 	if ws != nil {
-		h.wsHandler.Store((*rpcHandler)(nil))
+		h.wsHandler.Store(nil)
 		ws.server.Stop()
 	}
 	return ws != nil
@@ -379,12 +376,12 @@ func (h *httpServer) disableWS() bool {
 
 // rpcAllowed returns true when JSON-RPC over HTTP is enabled.
 func (h *httpServer) rpcAllowed() bool {
-	return h.httpHandler.Load().(*rpcHandler) != nil
+	return h.httpHandler.Load() != nil
 }
 
 // wsAllowed returns true when JSON-RPC over WebSocket is enabled.
 func (h *httpServer) wsAllowed() bool {
-	return h.wsHandler.Load().(*rpcHandler) != nil
+	return h.wsHandler.Load() != nil
 }
 
 // isWebsocket checks the header of an http request for a websocket upgrade request.