diff --git a/content/administration/odoo_sh/advanced/containers.rst b/content/administration/odoo_sh/advanced/containers.rst
index 3f8231d78..5b700ee8c 100644
--- a/content/administration/odoo_sh/advanced/containers.rst
+++ b/content/administration/odoo_sh/advanced/containers.rst
@@ -147,7 +147,7 @@ with a browser, but you can for instance:
 
 .. code-block:: bash
 
-  $  odoo-bin -i sale --without-demo=all --stop-after-init
+  $  odoo-bin -i sale --stop-after-init
 
 * update a module,
 
@@ -163,7 +163,6 @@ with a browser, but you can for instance:
 
 In the above commands, the argument:
 
-* ``--without-demo=all`` prevents demo data to be loaded for all modules
 * ``--stop-after-init`` will immediately shutdown the server instance after it completed the operations you asked.
 
 More options are available and detailed in the
diff --git a/content/developer/howtos/website_themes/setup.rst b/content/developer/howtos/website_themes/setup.rst
index 0284b88d3..0ea308ddd 100644
--- a/content/developer/howtos/website_themes/setup.rst
+++ b/content/developer/howtos/website_themes/setup.rst
@@ -247,7 +247,7 @@ A typical way to :ref:`run the server <reference/cmdline/server>` would be to ad
 .. example::
    .. code-block:: xml
 
-      ./odoo-bin --addons-path=../enterprise,addons --db-filter=<database> -d <database> --without-demo=all -i website --dev=xml
+      ./odoo-bin --addons-path=../enterprise,addons --db-filter=<database> -d <database> -i website --dev=xml
 
 .. list-table::
    :header-rows: 1
@@ -273,9 +273,6 @@ A typical way to :ref:`run the server <reference/cmdline/server>` would be to ad
 
        :option:`--update <odoo-bin --update>`
      - Comma-separated list of modules to update before running the server. (requires `-d`)
-   * - :option:`--without-demo <odoo-bin --without-demo>`
-     - Disables demo data loading for modules installed comma-separated; use `all` for all modules.
-       (requires `-d` and `-i`)
    * - :option:`--dev <odoo-bin --dev>`
      - Comma-separated list of features. For development purposes only. :ref:`More info
        <reference/cmdline/dev>`
diff --git a/content/developer/reference/backend/orm/changelog.rst b/content/developer/reference/backend/orm/changelog.rst
index e8a5d7653..7b1fb5aab 100644
--- a/content/developer/reference/backend/orm/changelog.rst
+++ b/content/developer/reference/backend/orm/changelog.rst
@@ -12,6 +12,8 @@ Odoo Online version 18.3
   See `#191549 <https://github.com/odoo/odoo/pull/191549>`_.
 - New cron API for notifying progress with batch commits.
   See `#197781 <https://github.com/odoo/odoo/pull/197781>`_.
+- Demo data no longer loaded by default.
+  See `#194585 <https://github.com/odoo/odoo/pull/194585>`_.
 
 Odoo Online version 18.2
 ========================
diff --git a/content/developer/reference/cli.rst b/content/developer/reference/cli.rst
index ff86f4ea6..5e24debc9 100644
--- a/content/developer/reference/cli.rst
+++ b/content/developer/reference/cli.rst
@@ -121,11 +121,14 @@ Running the server
     (:file:`{$HOME}/.odoorc` by default, and can be overridden using
     :option:`-c`).
 
+.. option:: --with-demo
+
+    install demo data in new databases.
+
 .. option:: --without-demo
 
-    disables demo data loading for modules installed
-    comma-separated, use ``all`` for all modules.
-    Requires :option:`-d` and :option:`-i`.
+    don't install demo data nor in new databases nor when installing new
+    modules in a database that uses demo data, this is the default.
 
 .. option:: --pidfile=<pidfile>
 
diff --git a/content/developer/tutorials/define_module_data.rst b/content/developer/tutorials/define_module_data.rst
index 332dc2329..656a65814 100644
--- a/content/developer/tutorials/define_module_data.rst
+++ b/content/developer/tutorials/define_module_data.rst
@@ -37,8 +37,8 @@ having data for demonstration purposes:
 * Test that the data is loaded correctly, without raising an error.
 * Setup most of the features to be used quickly when creating a new database.
 
-Demo data is automatically loaded when you start the server if you don't explicitly say you don't
-want it. This can be done in the database manager or with the command line.
+The database manager let you create databases with demo data. The same can be achieved via the
+command line with :option:`--with-demo <odoo-bin --with-demo>`.
 
 .. code-block:: console
 
@@ -51,13 +51,10 @@ want it. This can be done in the database manager or with the command line.
 
   Common options:
     [...]
-    --without-demo=WITHOUT_DEMO
-                        disable loading demo data for modules to be installed
-                        (comma-separated, use "all" for all modules). Requires
-                        -d and -i. Default is none
+    --with-demo         install demo data in new databases
   [...]
 
-  $ ./odoo-bin --addons-path=... -d db -i account --without-demo=all
+  $ ./odoo-bin --addons-path=... -d new-db -i base --with-demo
 
 Data Declaration
 ================