diff --git a/rpc/lib/server/http_server.go b/rpc/lib/server/http_server.go
index 8069a81d4..9ad782987 100644
--- a/rpc/lib/server/http_server.go
+++ b/rpc/lib/server/http_server.go
@@ -56,13 +56,14 @@ func StartHTTPServer(
 		listener = netutil.LimitListener(listener, config.MaxOpenConnections)
 	}
 
-	go func() {
-		err := http.Serve(
-			listener,
-			RecoverAndLogHandler(maxBytesHandler{h: handler, n: maxBodyBytes}, logger),
-		)
+	err = http.Serve(
+		listener,
+		RecoverAndLogHandler(maxBytesHandler{h: handler, n: maxBodyBytes}, logger),
+	)
+	if err != nil {
 		logger.Info("RPC HTTP server stopped", "err", err)
-	}()
+		return nil, err
+	}
 	return listener, nil
 }