diff --git a/reactos/base/applications/mstsc/settings.c b/reactos/base/applications/mstsc/settings.c
index 4aaa2aacab7..6a68282d556 100644
--- a/reactos/base/applications/mstsc/settings.c
+++ b/reactos/base/applications/mstsc/settings.c
@@ -275,7 +275,10 @@ ParseSettings(PRDPSETTINGS pRdpSettings,
                 else if (lpToken[0] == L's')
                 {
                     pRdpSettings->pSettings[i].Type = lpToken[0];
-                    lpToken = wcstok(NULL, szNewline);
+                    if (lpToken[2] == 13 || lpToken[2] == 10 || lpToken[2] == 0)
+                        lpToken[0] = 0; // terminate string
+                    else
+                        lpToken = wcstok(NULL, szNewline);
                     if (lpToken != NULL)
                         wcscpy(pRdpSettings->pSettings[i].Value.s, lpToken);
                 }