Fixed bug with saving Listen Key

This is a temporary workaround - a better fix will come soon!