diff --git a/plutus-pab/app/PSGenerator.hs b/plutus-pab/app/PSGenerator.hs
index 4cf409939d1..333748f38fb 100644
--- a/plutus-pab/app/PSGenerator.hs
+++ b/plutus-pab/app/PSGenerator.hs
@@ -167,6 +167,7 @@ writeTestData outputDir = do
             currencyInstance1 <- Simulator.activateContract defaultWallet Currency
             void $ Simulator.activateContract defaultWallet Currency
             void $ Simulator.activateContract defaultWallet Game
+            void $ Simulator.waitForEndpoint currencyInstance1 "Create native token"
             void $ Simulator.callEndpointOnInstance currencyInstance1 "Create native token" SimpleMPS {tokenName = "TestCurrency", amount = 10000000000}
             void $ Simulator.waitUntilFinished currencyInstance1
             report :: FullReport TestContracts <- Webserver.getFullReport
diff --git a/plutus-pab/plutus-pab.yaml b/plutus-pab/plutus-pab.yaml
index 387f1decf1c..404476b5841 100644
--- a/plutus-pab/plutus-pab.yaml
+++ b/plutus-pab/plutus-pab.yaml
@@ -25,7 +25,7 @@ nodeServerConfig:
     - getWallet: 3
 
 chainIndexConfig:
-  ciBaseUrl: http://localhost:8083
+  ciBaseUrl: http://localhost:9083
   ciWatchedAddresses: []
 
 requestProcessingConfig: