diff --git a/docs/source/troubleshooting/random-restart.rst b/docs/source/troubleshooting/random-restart.rst
index 749b29bcab..67069a99de 100644
--- a/docs/source/troubleshooting/random-restart.rst
+++ b/docs/source/troubleshooting/random-restart.rst
@@ -1,15 +1,17 @@
 Random Restarts
 ===============
 
-First try setting the baud rate to ``74880``. Example for Linux::
+Esp8266
+-------
 
-   python -m serial.tools.miniterm /dev/ttyUSB0 74880
+First try setting the baud rate to ``74880``::
+
+   make terminal COM_SPEED=74880
 
 The random symbols should become readable messages.
 
 If you see repeating messages containing ``rf_cal[0] !=0x05`` then most
-probably you should ``initialize`` the flash memory on your ESP8266
-device.
+probably you should ``initialize`` the flash memory on your ESP8266 device.
 
 To achieve this do the following:
 
@@ -34,3 +36,18 @@ To achieve this do the following:
 4) Verify flash data has been written successfully
 
       make verifyflash
+
+
+Esp32
+-----
+
+Bootloader messages should be visible and may give some indication as to the problem.
+
+If :envvar:`SDK_CUSTOM_CONFIG` has been set in your project, or the SDK configuration has otherwise
+been changed from defaults, try reverting it back to defaults::
+
+   make sdk-config-clean
+   make SDK_CUSTOM_CONFIG=
+
+The ESP IDF framework runs on FreeRTOS and there is a known deadlock problem related to flash memory access if FreeRTOS is initialised and running on both cores.
+For this reason, the setting ``CONFIG_FREERTOS_UNICODE=y`` must be set. See :issue:`2653`.