diff --git a/geth/docker-entrypoint.sh b/geth/docker-entrypoint.sh
index 72bc6157..c4406d8f 100755
--- a/geth/docker-entrypoint.sh
+++ b/geth/docker-entrypoint.sh
@@ -57,12 +57,12 @@ else
 fi
 
 # Detect existing DB; use PBSS if fresh
-#if [ -d "/var/lib/goethereum/geth/chaindata/" ]; then
-#  __pbbsme=""
-#else
-#  echo "Choosing PBSS for fresh sync"
-#  __pbbsme="--trie.path-based"
-#fi
+if [ -d "/var/lib/goethereum/geth/chaindata/" ]; then
+  __pbss=""
+else
+  echo "Choosing PBSS for fresh sync"
+  __pbss="--state.scheme path"
+fi
 
 if [ -f /var/lib/goethereum/prune-marker ]; then
   rm -f /var/lib/goethereum/prune-marker
@@ -76,5 +76,5 @@ if [ -f /var/lib/goethereum/prune-marker ]; then
 else
 # Word splitting is desired for the command line parameters
 # shellcheck disable=SC2086
-  exec "$@" ${__prune} ${__verbosity} ${EL_EXTRAS}
+  exec "$@" ${__pbss} ${__prune} ${__verbosity} ${EL_EXTRAS}
 fi