diff --git a/Changelog.md b/Changelog.md
index 61734d6..d068482 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,6 +1,10 @@
 Changelog
 =
 
+Version 2.0.2
+-
+* 'js(false)' will prevent Paloma from appending _callback_hook on the response.
+
 Version 2.0.1
 -
 * Bug Fix: `params` is not passed when calling filters.
diff --git a/lib/paloma/action_controller_filters.rb b/lib/paloma/action_controller_filters.rb
index a575da0..80fb07e 100644
--- a/lib/paloma/action_controller_filters.rb
+++ b/lib/paloma/action_controller_filters.rb
@@ -18,6 +18,8 @@ module Paloma
 
         
     def update_callback
+      return clear_callbacks if @__paloma_callback__.nil?
+
       add_to_callbacks @__paloma_callback__
 
       paloma_txt = view_context.render(
diff --git a/paloma.gemspec b/paloma.gemspec
index c623b43..f8a39f8 100644
--- a/paloma.gemspec
+++ b/paloma.gemspec
@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'paloma'
-  s.version     = '2.0.1'
+  s.version     = '2.0.2'
   s.summary     = "Provides an easy way to execute page-specific javascript for Rails."
   s.description = "Page-specific javascript for Rails done right"
   s.authors     = ["Karl Paragua", "Bia Esmero"]