diff --git a/CHANGELOG.md b/CHANGELOG.md
index 63bde14b3..f125d92d1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file.
 
+## [Sabaki v0.43.1][unreleased]
+
+**Fixed**
+
+* Fix setting handicap stones not working
+
 ## [Sabaki v0.43.0][v0.43.0] (2019-03-16)
 
 **Added**
diff --git a/src/components/App.js b/src/components/App.js
index cd795af74..9b14a002e 100644
--- a/src/components/App.js
+++ b/src/components/App.js
@@ -1598,7 +1598,7 @@ class App extends Component {
 
                         setting.set('game.default_komi', value)
                     } else if (key === 'handicap') {
-                        let board = gametree.getBoard(tree, 0)
+                        let board = gametree.getBoard(tree, tree.root.id)
                         let stones = board.getHandicapPlacement(+value)
 
                         value = stones.length