diff --git a/lib/sinatra/reloader.rb b/lib/sinatra/reloader.rb
index a20d2c9..1b4c12d 100644
--- a/lib/sinatra/reloader.rb
+++ b/lib/sinatra/reloader.rb
@@ -139,8 +139,8 @@ def ignore?
     def self.registered(klass)
       klass.extend BaseMethods
       klass.extend ExtensionMethods
-      klass.enable :reload_templates
       klass.set(:reloader) { klass.development? }
+      klass.set(:reload_templates) { klass.reloader? }
       klass.before do
         if klass.reloader?
           if Reloader.thread_safe?