diff --git a/controllers/challenge.js b/controllers/challenge.js
index 38d05e6bf63..c647feba67f 100644
--- a/controllers/challenge.js
+++ b/controllers/challenge.js
@@ -147,10 +147,12 @@ exports.returnCurrentChallenge = function(req, res, next) {
 exports.returnIndividualChallenge = function(req, res, next) {
   var dashedName = req.params.challengeName;
 
-  var challengeName = dashedName.replace(/\-/g, ' ')
-    .split(' ')
-    .slice(1)
-    .join(' ');
+  var challengeName = /^(bonfire|waypoint)/.test(dashedName) ? dashedName
+      .replace(/\-/g, ' ')
+      .split(' ')
+      .slice(1)
+      .join(' ')
+    : dashedName;
 
   Challenge.find({'name': new RegExp(challengeName, 'i')},
     function(err, challengeFromMongo) {