diff --git a/pype/settings/defaults/system_settings/modules.json b/pype/settings/defaults/system_settings/modules.json
index 93c099a43e..69727b5148 100644
--- a/pype/settings/defaults/system_settings/modules.json
+++ b/pype/settings/defaults/system_settings/modules.json
@@ -1,6 +1,7 @@
 {
     "Avalon": {
         "AVALON_MONGO": "mongodb://localhost:2707",
+        "avalon_mongo_timeout": 1000,
         "AVALON_DB_DATA": "{PYPE_SETUP_PATH}/../mongo_db_data",
         "AVALON_THUMBNAIL_ROOT": "{PYPE_SETUP_PATH}/../avalon_thumails",
         "environment": {
diff --git a/pype/tools/settings/settings/gui_schemas/system_schema/schema_modules.json b/pype/tools/settings/settings/gui_schemas/system_schema/schema_modules.json
index 62aaafc27b..83a57f4b80 100644
--- a/pype/tools/settings/settings/gui_schemas/system_schema/schema_modules.json
+++ b/pype/tools/settings/settings/gui_schemas/system_schema/schema_modules.json
@@ -14,6 +14,12 @@
                     "key": "AVALON_MONGO",
                     "label": "Avalon Mongo URL"
                 },
+                {
+                    "type": "number",
+                    "key": "avalon_mongo_timeout",
+                    "minimum": 0,
+                    "label": "Avalon Mongo Timeout (ms)"
+                },
                 {
                     "type": "text",
                     "key": "AVALON_DB_DATA",