diff --git a/docker-compose.yml b/docker-compose.yml
index edbd4cf742f747df056453fa59994ce89f26433b..dcdf2f8c242f5b29043be7ba98ea51a452979b9e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -33,5 +33,8 @@ services:
       # PROXY_URL: https://studip.example.com/
       # AUTO_PROXY: 1
 
+      # Demo data for your studip instance
+      DEMO_DATA: 1
+
 volumes:
   db_data: {}
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index bd2cb224520a1ee967a1db78796f6478a828855f..0920f61c628e55371a16daeeca1880219a2de952 100644
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -37,8 +37,11 @@ if [ ! -f $CONFIGFILE ]; then
     echo "INSTALL ROOTUSER"
     mysql -f -u $MYSQL_USER -h $MYSQL_HOST -p$MYSQL_PASSWORD $MYSQL_DATABASE < ${STUDIP}/db/studip_root_user.sql
 
-    echo "INSTALL DEMODATA"
-    mysql -f -u $MYSQL_USER -h $MYSQL_HOST -p$MYSQL_PASSWORD $MYSQL_DATABASE < ${STUDIP}/db/studip_demo_data.sql
+    # Check if demodata is required
+    if [ ! -z $DEMO_DATA ]; then
+        echo "INSTALL DEMODATA"
+        mysql -f -u $MYSQL_USER -h $MYSQL_HOST -p$MYSQL_PASSWORD $MYSQL_DATABASE < ${STUDIP}/db/studip_demo_data.sql
+    fi
 
     echo "INSTALLATION FINISHED"
 fi