diff --git a/src/js/matrix.js b/src/js/matrix.js
index 5aa78aa..2a4486c 100644
--- a/src/js/matrix.js
+++ b/src/js/matrix.js
@@ -685,9 +685,8 @@ Matrix.prototype.fromLine = function(line) {
     let field0 = fields[0];
 
     // Switches
-    let pos = field0.indexOf(':');
-    if ( pos !== -1 ) {
-        let switchName = field0.slice(0, pos);
+    if ( this.reSwitchRule.test(field0) ) {
+        let switchName = field0.slice(0, -1);
         let srcHostname = punycode.toASCII(fields[1]);
         let state = fields[2];
         if (
@@ -736,6 +735,8 @@ Matrix.prototype.fromLine = function(line) {
     return true;
 };
 
+Matrix.prototype.reSwitchRule = /^[0-9a-z-]+:$/;
+
 /******************************************************************************/
 
 Matrix.prototype.toSelfie = function() {