diff --git a/lib/travis/api/app/base.rb b/lib/travis/api/app/base.rb
index 4ab5af58..90c73b42 100644
--- a/lib/travis/api/app/base.rb
+++ b/lib/travis/api/app/base.rb
@@ -18,6 +18,11 @@ class Travis::Api::App
       "This feature has not yet been implemented. Sorry :(\n\nPull Requests welcome!"
     end
 
+    # hotfix??
+    def route_missing
+      @app ? forward : halt 404
+    end
+
     def call(env)
       super
     rescue Sinatra::NotFound