diff --git a/guacamole/src/main/webapp/scripts/guac-ui.js b/guacamole/src/main/webapp/scripts/guac-ui.js
index f06f43c8d..eec77a6d9 100644
--- a/guacamole/src/main/webapp/scripts/guac-ui.js
+++ b/guacamole/src/main/webapp/scripts/guac-ui.js
@@ -32,7 +32,7 @@ GuacUI.sessionState = new GuacamoleSessionState();
  */
 GuacUI.createElement = function(tagname, classname) {
     var new_element = document.createElement(tagname);
-    new_element.className = classname;
+    if (classname) new_element.className = classname;
     return new_element;
 };