diff --git a/OpenSim/Region/Framework/Scenes/LinksetData.cs b/OpenSim/Region/Framework/Scenes/LinksetData.cs
index b4d3c6a7be..20120e1bef 100644
--- a/OpenSim/Region/Framework/Scenes/LinksetData.cs
+++ b/OpenSim/Region/Framework/Scenes/LinksetData.cs
@@ -513,7 +513,10 @@ namespace OpenSim.Region.Framework.Scenes
                     {
                         bw.Write(kvp.Key);
                         bw.Write(kvp.Value.Value);
-                        bw.Write(kvp.Value.Password);
+                        if(kvp.Value.IsProtected)
+                            bw.Write(kvp.Value.Password);
+                        else
+                            bw.Write((byte)0);
                     }
                 }
                 return;