diff --git a/app.js b/app.js
index 3b620225cd..2417185e98 100644
--- a/app.js
+++ b/app.js
@@ -319,7 +319,7 @@ app.post('/completed-challenge', function (req, res) {
     var timestamp = req.user.challengesHash;
     var points = 0;
     for (var key in timestamp) {
-        if (timestamp[key] > 0) {
+        if (timestamp[key] > 0 && req.body.challengeNumber < 54) {
             points += 1;
         }
     }
diff --git a/controllers/challenges.js b/controllers/challenges.js
index 6341ce520f..9de4496a4c 100644
--- a/controllers/challenges.js
+++ b/controllers/challenges.js
@@ -11,7 +11,12 @@ var highestChallengeNumber = 53;
 
 exports.returnChallenge = function(req, res, next) {
     var challengeNumber = parseInt(req.params.challengeNumber) || 0;
-    if (challengeNumber > highestChallengeNumber) { challengeNumber = 0; }
+    if (challengeNumber > highestChallengeNumber) {
+        req.flash('errors', {
+            msg: "It looks like you've either completed all the challenges we have available or requested a challenge we don't have."
+        });
+        return res.redirect('../challenges/0');
+    }
     Challenge.find({}, null, { sort: { challengeNumber: 1 } }, function(err, c) {
         if (err) {
             debug('Challenge err: ', err);