diff --git a/docker/demo/application-demo.properties b/docker/demo/application-demo.properties
index afac8a9b..ca20c2a7 100644
--- a/docker/demo/application-demo.properties
+++ b/docker/demo/application-demo.properties
@@ -16,6 +16,10 @@ spring.datasource.initialization-mode=always
 spring.datasource.url=jdbc:mariadb://${datastore.mariadb.server.address}:${datastore.mariadb.server.port}/SEBServer?useSSL=false&createDatabaseIfNotExist=true
 spring.datasource.driver-class-name=org.mariadb.jdbc.Driver
 spring.datasource.platform=demo
+spring.datasource.hikari.initializationFailTimeout=30000
+spring.datasource.hikari.connectionTimeout=30000
+spring.datasource.hikari.idleTimeout=600000
+spring.datasource.hikari.maxLifetime=1800000
 
 # webservice configuration
 sebserver.test.property=This is a SEB Server Demo
diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/activity/ActivitiesPane.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/activity/ActivitiesPane.java
index bcc26c8a..e6c913fb 100644
--- a/src/main/java/ch/ethz/seb/sebserver/gui/content/activity/ActivitiesPane.java
+++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/activity/ActivitiesPane.java
@@ -358,7 +358,10 @@ public class ActivitiesPane implements TemplateComposer {
                     navigation.getItems(),
                     state.activityAnchor());
             if (item != null) {
-                navigation.select(item);
+                final PageAction action = getActivitySelection(item);
+                this.pageService.executePageAction(action, result -> {
+                    navigation.select(item);
+                });
             }
         }
     }
diff --git a/src/main/resources/config/application-demo.properties b/src/main/resources/config/application-demo.properties
index 5e400d6f..a4c2aa49 100644
--- a/src/main/resources/config/application-demo.properties
+++ b/src/main/resources/config/application-demo.properties
@@ -16,6 +16,11 @@ spring.datasource.initialization-mode=always
 spring.datasource.url=jdbc:mariadb://${datastore.mariadb.server.address}:${datastore.mariadb.server.port}/SEBServer?useSSL=false&createDatabaseIfNotExist=true
 spring.datasource.driver-class-name=org.mariadb.jdbc.Driver
 spring.datasource.platform=demo
+spring.datasource.hikari.initializationFailTimeout=30000
+spring.datasource.hikari.connectionTimeout=30000
+spring.datasource.hikari.idleTimeout=600000
+spring.datasource.hikari.maxLifetime=1800000
+
 
 # webservice configuration
 sebserver.webservice.distributed=false