diff --git a/lib/kick.js b/lib/kick.js
index 7d7a809..925f0f5 100644
--- a/lib/kick.js
+++ b/lib/kick.js
@@ -68,7 +68,6 @@ var exports = module.exports = function(options) {
     req.res = res;
     res.req = req;
     res.locals = {};
-    app.settings = {};
 
     // path, querystring
     var pathAndQuery = req.url.split('?', 2);
@@ -139,13 +138,15 @@ var exports = module.exports = function(options) {
   }
 
   var _get = app.get;
+  app.settings = {};
+
   app.set = function(key, val){
     app.settings[key] = val;
     return app;
   }
 
   app.get = function() {
-    if(arguments.length == 1) return app.settings[key];
+    if(arguments.length == 1) return app.settings[arguments[0]];
     _get.apply(null, arguments);
   }