diff --git a/includes/translation.handler.inc b/includes/translation.handler.inc
index 4a87816..defb574 100644
--- a/includes/translation.handler.inc
+++ b/includes/translation.handler.inc
@ -677,7 +677,7 @@ class EntityTranslationDefaultHandler implements EntityTranslationHandlerInterfa
    * @see EntityTranslationHandlerInterface::getFormLanguage()
    */
   public function getFormLanguage() {
-    return $this->formLanguage;
+    return !empty($this->formLanguage) ? $this->formLanguage : LANGUAGE_NONE;
   }
 
   /**