diff --git a/lib/gollum/frontend/public/gollum/javascript/editor/gollum.editor.js b/lib/gollum/frontend/public/gollum/javascript/editor/gollum.editor.js
index d24af06f..bba3faa7 100755
--- a/lib/gollum/frontend/public/gollum/javascript/editor/gollum.editor.js
+++ b/lib/gollum/frontend/public/gollum/javascript/editor/gollum.editor.js
@@ -167,7 +167,7 @@
 
     setActiveLanguage: function( name ) {
       // On first load _ACTIVE_LANG.length is 0 and evtChangeFormat isn't called.
-      if ( LanguageDefinition._ACTIVE_LANG.length <= 0 ) {
+      if ( LanguageDefinition._ACTIVE_LANG != null && LanguageDefinition._ACTIVE_LANG.length <= 0 ) {
         FormatSelector.updateCommitMessage( name );
       }