diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
index bedd3d09ce..f5b46bd20c 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
@@ -122,6 +122,8 @@ namespace OpenSim.Region.ClientStack.Linden
 
         private float m_PrimScaleMin = 0.001f;
 
+        private bool m_AllowCapHomeLocation = true;
+
         private enum FileAgentInventoryState : int
         {
             idle = 0,
@@ -176,6 +178,15 @@ namespace OpenSim.Region.ClientStack.Linden
                             m_testAssetsCreatorID = id;
                     }
                 }
+
+                IConfig CapsConfig = config.Configs["ClientStack.LindenCaps"];
+                if (CapsConfig != null)
+                {
+                    string homeLocationUrl = CapsConfig.GetString("Cap_HomeLocation", "localhost");
+                    if(homeLocationUrl == String.Empty)
+                        m_AllowCapHomeLocation = false;
+                
+                }
             }
 
             m_assetService = m_Scene.AssetService;
@@ -241,10 +252,12 @@ namespace OpenSim.Region.ClientStack.Linden
                 m_HostCapsObj.RegisterHandler("UpdateScriptTaskInventory", req);
                 m_HostCapsObj.RegisterHandler("UpdateScriptTask", req);
 
-                IRequestHandler HomeLocationHandler = new RestStreamHandler(
+                if(m_AllowCapHomeLocation)
+                {
+                    IRequestHandler HomeLocationHandler = new RestStreamHandler(
                         "POST", GetNewCapPath(), HomeLocation, "HomeLocation", null);
-                m_HostCapsObj.RegisterHandler("HomeLocation", HomeLocationHandler);
-
+                    m_HostCapsObj.RegisterHandler("HomeLocation", HomeLocationHandler);
+                }
 //                IRequestHandler animSetRequestHandler
 //                    = new RestStreamHandler(
 //                        "POST", capsBase + m_animSetTaskUpdatePath, AnimSetTaskInventory, "UpdateScript", null);
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index df92921a00..dbc09fd89c 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -725,7 +725,7 @@
     Cap_GetObjectCost = ""
     Cap_GetObjectPhysicsData = ""
     Cap_GroupProposalBallot = ""
-    Cap_HomeLocation = ""
+    Cap_HomeLocation = "localhost"
     Cap_LandResources = ""
     Cap_MapLayer = "localhost"
     Cap_MapLayerGod = "localhost"