diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt
index c983fb436..9e4473655 100644
--- a/builtin/settingtypes.txt
+++ b/builtin/settingtypes.txt
@@ -2120,9 +2120,6 @@ emergequeue_limit_diskonly (Limit of emerge queues on disk) int 64
 emergequeue_limit_generate (Limit of emerge queues to generate) int 64
 
 #    Number of emerge threads to use.
-#    WARNING: Currently there are multiple bugs that may cause crashes when
-#    'num_emerge_threads' is larger than 1. Until this warning is removed it is
-#    strongly recommended this value is set to the default '1'.
 #    Value 0:
 #    -    Automatic selection. The number of emerge threads will be
 #    -    'number of processors - 2', with a lower limit of 1.
diff --git a/minetest.conf.example b/minetest.conf.example
index 1c1796a14..f04822c47 100644
--- a/minetest.conf.example
+++ b/minetest.conf.example
@@ -3261,9 +3261,6 @@
 # emergequeue_limit_generate = 64
 
 #    Number of emerge threads to use.
-#    WARNING: Currently there are multiple bugs that may cause crashes when
-#    'num_emerge_threads' is larger than 1. Until this warning is removed it is
-#    strongly recommended this value is set to the default '1'.
 #    Value 0:
 #    -    Automatic selection. The number of emerge threads will be
 #    -    'number of processors - 2', with a lower limit of 1.