diff --git a/src/freedombone-app-peertube b/src/freedombone-app-peertube
index 9cf13ca4..4e3cd6d6 100755
--- a/src/freedombone-app-peertube
+++ b/src/freedombone-app-peertube
@@ -590,7 +590,8 @@ function peertube_create_config {
     echo '    size: 10 # Max number of previews you want to cache' >> $peertube_config_file
     echo '' >> $peertube_config_file
     echo 'admin:' >> $peertube_config_file
-    echo "  email: '$MY_EMAIL_ADDRESS'" >> $peertube_config_file
+    # This is deliberately a dummy email address
+    echo "  email: 'testuser@testdomain.net'" >> $peertube_config_file
     echo '' >> $peertube_config_file
     echo 'signup:' >> $peertube_config_file
     echo '  enabled: true' >> $peertube_config_file
@@ -830,6 +831,12 @@ function install_peertube {
     systemctl start peertube
     systemctl restart nginx
 
+    # wait for the database to get generated after initial peertube daemon start
+    sleep 10
+
+    # update the admin email address after creation of the database
+    sed -i "s|email: .*|email: '$MY_EMAIL_ADDRESS'|g" $PEERTUBE_DIR/config/production.yaml
+
     set_completion_param "peertube domain" "$PEERTUBE_DOMAIN_NAME"
     APP_INSTALLED=1
 }