diff --git a/app/controllers/public/api_controller.rb b/app/controllers/public/api_controller.rb
index b7fffcd..cb1404f 100644
--- a/app/controllers/public/api_controller.rb
+++ b/app/controllers/public/api_controller.rb
@@ -2,12 +2,18 @@ class ApiController < PublicController
 
   no_design_blocks
 
+  helper_method :endpoints
+
   def index
-    @api = Noosfero::API.api_class
   end
 
   def playground
-    @api = Noosfero::API.api_class
+  end
+
+  private
+
+  def endpoints
+    Noosfero::API::API.endpoints(environment)
   end
 
 end
diff --git a/app/views/api/index.html.erb b/app/views/api/index.html.erb
index bdce7c3..3e2e27d 100644
--- a/app/views/api/index.html.erb
+++ b/app/views/api/index.html.erb
@@ -4,7 +4,7 @@
 <%= s_('api-playground|Try the %s') % link_to('API Playground', '/api/playground') %>
 </div>
 
-<%= @api.endpoints.map do |endpoint|
+<%= endpoints.map do |endpoint|
   app = endpoint.options[:app].to_s
   unless app.blank?
     content_tag(:h2, app.split('::').last.to_s, title: app) +
diff --git a/app/views/api/playground.html.erb b/app/views/api/playground.html.erb
index c953da6..1d0cc57 100644
--- a/app/views/api/playground.html.erb
+++ b/app/views/api/playground.html.erb
@@ -2,7 +2,7 @@
 
 <script>
 var endpoints = <%=
-@api.endpoints.map do |endpoint|
+endpoints.map do |endpoint|
   app = endpoint.options[:app].to_s
   unless app.blank?
     endpoint.routes.map do |route|
diff --git a/lib/noosfero/api/api.rb b/lib/noosfero/api/api.rb
index 1c2e4ac..e279c4d 100644
--- a/lib/noosfero/api/api.rb
+++ b/lib/noosfero/api/api.rb
@@ -28,6 +28,7 @@ module Noosfero
 
       before { setup_multitenancy }
       before { detect_stuff_by_domain }
+      before { filter_disabled_plugins_endpoints }
       after { set_session_cookie }
 
       version 'v1'
@@ -57,10 +58,26 @@ module Noosfero
           end
         end
       end
-    end
 
-    def self.api_class
-      API
+      def self.endpoint_unavailable?(endpoint, environment)
+        api_class = endpoint.options[:app] || endpoint.options[:for]
+        if api_class.present?
+          klass = api_class.name.deconstantize.constantize
+          return klass < Noosfero::Plugin && !environment.plugin_enabled?(klass)
+        end
+      end
+
+      class << self
+        def endpoints_with_plugins(environment = nil)
+          if environment.present?
+            cloned_endpoints = endpoints_without_plugins.dup
+            cloned_endpoints.delete_if { |endpoint| endpoint_unavailable?(endpoint, environment) }
+          else
+            endpoints_without_plugins
+          end
+        end
+        alias_method_chain :endpoints, :plugins
+      end
     end
   end
 end
diff --git a/lib/noosfero/api/helpers.rb b/lib/noosfero/api/helpers.rb
index 6f55996..35a3be4 100644
--- a/lib/noosfero/api/helpers.rb
+++ b/lib/noosfero/api/helpers.rb
@@ -127,6 +127,10 @@ module Noosfero
       #              error helpers             #
       ##########################################
 
+      def not_found!
+        render_api_error!('404 Not found', 404)
+      end
+
       def forbidden!
         render_api_error!('403 Forbidden', 403)
       end
@@ -184,6 +188,10 @@ module Noosfero
         end
       end
 
+      def filter_disabled_plugins_endpoints
+        not_found! if Noosfero::API::API.endpoint_unavailable?(self, !@environment)
+      end
+
       private
 
       def parser_params(params)
diff --git a/test/unit/api/api_test.rb b/test/unit/api/api_test.rb
new file mode 100644
index 0000000..af3c89c
--- /dev/null
+++ b/test/unit/api/api_test.rb
@@ -0,0 +1,29 @@
+require File.dirname(__FILE__) + '/test_helper'
+
+class MyPlugin < Noosfero::Plugin;end
+class MyPlugin::API;end
+
+class APITest < ActiveSupport::TestCase
+
+  should 'endpoint should not be available if its plugin is unavailable' do
+    endpoint = mock()
+    environment = Environment.default
+    environment.stubs(:plugin_enabled?).returns(false)
+    endpoint.stubs(:options).returns({:for => MyPlugin::API})
+
+    assert Noosfero::API::API.endpoint_unavailable?(endpoint, environment)
+  end
+
+  should 'endpoint should be available if its plugin is available' do
+    class MyPlugin < Noosfero::Plugin;end
+    class MyPlugin::API;end
+
+    endpoint = mock()
+    environment = Environment.default
+    environment.stubs(:plugin_enabled?).returns(true)
+    endpoint.stubs(:options).returns({:for => MyPlugin::API})
+
+    assert !Noosfero::API::API.endpoint_unavailable?(endpoint, environment)
+  end
+
+end
diff --git a/test/unit/api/helpers_test.rb b/test/unit/api/helpers_test.rb
index 676bf96..deaf85e 100644
--- a/test/unit/api/helpers_test.rb
+++ b/test/unit/api/helpers_test.rb
@@ -161,6 +161,13 @@ class APIHelpersTest < ActiveSupport::TestCase
     assert_nil make_conditions_with_parameter[:type]
   end
 
+  should 'render not_found if endpoint is unavailable' do
+    Noosfero::API::API.stubs(:endpoint_unavailable?).returns(true)
+    self.expects(:not_found!)
+
+    filter_disabled_plugins_endpoints
+  end
+
   protected
 
   def error!(info, status)
--
libgit2 0.21.2