diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb
index c00bcf95b..34cdb2e09 100644
--- a/app/controllers/pages_controller.rb
+++ b/app/controllers/pages_controller.rb
@@ -3,5 +3,7 @@ class PagesController < ApplicationController
 
   def show
     render action: params[:id]
+  rescue ActionView::MissingTemplate
+    raise ActionController::RoutingError.new('Not Found')
   end
 end
diff --git a/spec/controllers/pages_controller_spec.rb b/spec/controllers/pages_controller_spec.rb
index d0d04fc69..b696adb77 100644
--- a/spec/controllers/pages_controller_spec.rb
+++ b/spec/controllers/pages_controller_spec.rb
@@ -58,4 +58,10 @@ describe PagesController do
     end
   end
 
+  describe 'Not found pages' do
+    it 'should return a 404 message' do
+      expect { get :show, id: "nonExistentPage" }.to raise_error(ActionController::RoutingError)
+    end
+  end
+
 end