diff --git a/Moose Development/Moose/Core/Message.lua b/Moose Development/Moose/Core/Message.lua
index 6c15c5dc3..0a3defdec 100644
--- a/Moose Development/Moose/Core/Message.lua	
+++ b/Moose Development/Moose/Core/Message.lua	
@@ -516,10 +516,10 @@ function MESSAGE.SetMSRS(PathToSRS,Port,PathToCredentials,Frequency,Modulation,G
   end
   
   _MESSAGESRS.label = Label or MSRS.Label or "MESSAGE"
-  _MESSAGESRS.MSRS:SetLabel(Label or "MESSAGE")
+  _MESSAGESRS.MSRS:SetLabel(_MESSAGESRS.label)
 
   _MESSAGESRS.port = Port or MSRS.port or 5002
-  _MESSAGESRS.MSRS:SetPort(Port or 5002)
+  _MESSAGESRS.MSRS:SetPort(_MESSAGESRS.port)
 
   _MESSAGESRS.volume = Volume or MSRS.volume or 1
   _MESSAGESRS.MSRS:SetVolume(_MESSAGESRS.volume)