diff --git a/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs b/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs
index d2fbfa65d1..ea68114f52 100644
--- a/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs
+++ b/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs
@@ -117,7 +117,8 @@ namespace OpenSim.Server.Handlers.MapImage
                     return FailureResult("Bad request.");
                 }
                 int x = 0, y = 0;
-                UUID scopeID = new UUID("07f8d88e-cd5e-4239-a0ed-843f75d09992");
+//                UUID scopeID = new UUID("07f8d88e-cd5e-4239-a0ed-843f75d09992");
+                UUID scopeID = UUID.Zero;
                 Int32.TryParse(request["X"].ToString(), out x);
                 Int32.TryParse(request["Y"].ToString(), out y);
                 if (request.ContainsKey("SCOPE"))
diff --git a/OpenSim/Server/Handlers/Map/MapGetServerConnector.cs b/OpenSim/Server/Handlers/Map/MapGetServerConnector.cs
index e2c8f359b2..1ae669cc80 100644
--- a/OpenSim/Server/Handlers/Map/MapGetServerConnector.cs
+++ b/OpenSim/Server/Handlers/Map/MapGetServerConnector.cs
@@ -95,7 +95,8 @@ namespace OpenSim.Server.Handlers.MapImage
             byte[] result = new byte[0];
             string format = string.Empty;
 
-            UUID scopeID = new UUID("07f8d88e-cd5e-4239-a0ed-843f75d09992");
+//            UUID scopeID = new UUID("07f8d88e-cd5e-4239-a0ed-843f75d09992");
+            UUID scopeID = UUID.Zero;
 
             string[] bits = path.Trim('/').Split(new char[] {'/'});
             if (bits.Length > 1)
diff --git a/OpenSim/Server/Handlers/Map/MapRemoveServerConnector.cs b/OpenSim/Server/Handlers/Map/MapRemoveServerConnector.cs
index 88d774a4f6..4f8f7e106a 100644
--- a/OpenSim/Server/Handlers/Map/MapRemoveServerConnector.cs
+++ b/OpenSim/Server/Handlers/Map/MapRemoveServerConnector.cs
@@ -119,7 +119,8 @@ namespace OpenSim.Server.Handlers.MapImage
                 int x = 0, y = 0;
                 Int32.TryParse(request["X"].ToString(), out x);
                 Int32.TryParse(request["Y"].ToString(), out y);
-                UUID scopeID = new UUID("07f8d88e-cd5e-4239-a0ed-843f75d09992");
+//                UUID scopeID = new UUID("07f8d88e-cd5e-4239-a0ed-843f75d09992");
+                UUID scopeID = UUID.Zero;
                 if (request.ContainsKey("SCOPE"))
                     UUID.TryParse(request["SCOPE"].ToString(), out scopeID);