diff --git a/lib/middleware/domain.js b/lib/middleware/domain.js
index b1e3925..1dd2e8d 100644
--- a/lib/middleware/domain.js
+++ b/lib/middleware/domain.js
@@ -45,6 +45,13 @@ module.exports = function(req, next, abort){
     console.log(label, req.domain)
     next()
   } else {
-    getDomain(req.suggestedDomain)
+    if (req.domain == "_"){
+      req.domain = [moniker.choose(), req.config.platform].join(".")
+      console.log(label, req.domain)
+      next()
+    } else {
+      getDomain(req.suggestedDomain)  
+    }
+    
   }
 }
diff --git a/package.json b/package.json
index 5bbda4c..6400cdc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "surge",
-  "version": "0.18.0",
+  "version": "0.19.0",
   "description": "CDN for front-end developers",
   "author": "Brock Whitten <brock@chloi.io>",
   "bin": "./lib/cli.js",