diff --git a/lib/noosfero/api/v1/environments.rb b/lib/noosfero/api/v1/environments.rb
index 695dea0..f99f26a 100644
--- a/lib/noosfero/api/v1/environments.rb
+++ b/lib/noosfero/api/v1/environments.rb
@@ -10,17 +10,13 @@ module Noosfero
             present environment.signup_person_fields
           end
 
-          # Returns the given environment
           get ':id' do
-            id = params[:id]
-            if (id == "default")
+            if (params[:id] == "default")
               present Environment.default
+            elsif (params[:id] == "context")
+              present environment
             else
-              if (id == "context")
-                present Environment.find_by_name(request.host)
-              else
-                present Environment.find(params[:id])
-              end
+              present Environment.find(params[:id])
             end
           end
 
diff --git a/test/unit/api/environment_test.rb b/test/unit/api/environment_test.rb
index 211311c..64ff620 100644
--- a/test/unit/api/environment_test.rb
+++ b/test/unit/api/environment_test.rb
@@ -25,8 +25,9 @@ class SearchTest < ActiveSupport::TestCase
 
   should 'return context environment' do
     context_env = fast_create(Environment)
-    context_env.name = "example.org"
+    context_env.name = "example org"
     context_env.save
+    context_env.domains<< Domain.new(:name => 'example.org')
     default_env = Environment.default
     assert_not_equal context_env.id, default_env.id
     get "/api/v1/environment/context"
--
libgit2 0.21.2