diff --git a/core/utils.c b/core/utils.c
index 588f2cf1..396a7c07 100644
--- a/core/utils.c
+++ b/core/utils.c
@@ -3140,6 +3140,10 @@ struct uwsgi_app *uwsgi_add_app(int id, uint8_t modifier1, char *mountpoint, int
 		}
 	}
 
+	if ((mountpoint_len == 0 || (mountpoint_len =- 1 && mountpoint[0] == '/')) && uwsgi.default_app == -1) {
+                uwsgi.default_app = id;
+        }
+
 	return wi;
 }