diff --git a/Docs/python_api.md b/Docs/python_api.md
index a8f791228..832e3d3f4 100644
--- a/Docs/python_api.md
+++ b/Docs/python_api.md
@@ -2037,11 +2037,9 @@ With hybrid physics on, changes the radius of the area of influence where physic
     - **Parameters:**
         - `r` (_float<small> – meters</small>_) – New radius where physics are enabled.  
 - <a name="carla.TrafficManager.set_osm_mode"></a>**<font color="#7fb800">set_osm_mode</font>**(<font color="#00a6ed">**self**</font>, <font color="#00a6ed">**mode_switch**=True</font>)  
-Enables or disables the OSM mode. This mode allows the user to run TM in a map created with the [OSM feature](tuto_G_openstreetmap.md). These maps allow having dead-end streets. Normally, if vehicles cannot find the next waypoint, TM crashes. Now it throws an exception, warning the user to activate <code>set_osm_mode</code> and then stops.  
+Enables or disables the OSM mode. This mode allows the user to run TM in a map created with the [OSM feature](tuto_G_openstreetmap.md). These maps allow having dead-end streets. Normally, if vehicles cannot find the next waypoint, TM crashes. If OSM mode is enabled, it will show a warning, and destroy vehicles when necessary.  
     - **Parameters:**
         - `mode_switch` (_bool_) – If __True__, the OSM mode is enabled.  
-    - **Note:** <font color="#8E8E8E">_The argument `--osm` in `PythonAPI/examples/spawn_npc.py` makes use of this method to enable OSM mode.
-_</font>  
 
 ---
 
diff --git a/Docs/tuto_G_openstreetmap.md b/Docs/tuto_G_openstreetmap.md
index bd3acc362..eb6a4d9a9 100644
--- a/Docs/tuto_G_openstreetmap.md
+++ b/Docs/tuto_G_openstreetmap.md
@@ -101,7 +101,7 @@ Either way, the map should be ingested automatically in CARLA and the result sho
 <div style="text-align: right"><i>Outcome of the CARLA map generation using OpenStreetMap.</i></div>
 
 !!! Warning
-    The roads generated end abruptly in the borders of the map. This will cause the TM to crash when vehicles are not able to find the next waypoint. Use [set_osm_mode()](python_api.md#carlatrafficmanager) or directly the `--osm` argument in `PythonAPI/examples/spawn_npc.py` to enable de OSM mode. This will destroy the vehicles when no next waypoint is found.  
+    The roads generated end abruptly in the borders of the map. This will cause the TM to crash when vehicles are not able to find the next waypoint. To avoid this, the OSM mode is set to __True__ by default ([set_osm_mode()](python_api.md#carlatrafficmanager)). This will show a warning, and destroy vehicles when necessary.  
 
 ---
 
diff --git a/PythonAPI/docs/client.yml b/PythonAPI/docs/client.yml
index 6af03c766..4b9c12861 100644
--- a/PythonAPI/docs/client.yml
+++ b/PythonAPI/docs/client.yml
@@ -450,10 +450,8 @@
         default: true
         doc: >
           If __True__, the OSM mode is enabled. 
-      note: >
-        The argument `--osm` in `PythonAPI/examples/spawn_npc.py` makes use of this method to enable OSM mode.
       doc: >
-        Enables or disables the OSM mode. This mode allows the user to run TM in a map created with the [OSM feature](tuto_G_openstreetmap.md). These maps allow having dead-end streets. Normally, if vehicles cannot find the next waypoint, TM crashes. Now it throws an exception, warning the user to activate <code>set_osm_mode</code> and then stops.  
+        Enables or disables the OSM mode. This mode allows the user to run TM in a map created with the [OSM feature](tuto_G_openstreetmap.md). These maps allow having dead-end streets. Normally, if vehicles cannot find the next waypoint, TM crashes. If OSM mode is enabled, it will show a warning, and destroy vehicles when necessary.  
     # --------------------------------------
 
   - class_name: OpendriveGenerationParameters