diff --git a/entity_display_field.module b/entity_display_field.module
index 025661d..8c9d270 100644
--- a/entity_display_field.module
+++ b/entity_display_field.module
@@ -152,11 +152,11 @@ function entity_display_field_entity_view_mode_alter(&$view_mode, $context) {
   // If display fields are present, swap the view mode.
   if (!empty($display_fields)) {
     foreach (array_keys($display_fields) as $field_name) {
-      if (!empty($context['entity']->{$field_name})) {
+      if (!empty($context['entity']->{$field_name}[$lang][0]['entity_display'])) {
 
         $display_mode = $context['entity']->{$field_name}[$lang][0]['entity_display'];
 
-        if (!empty($display_mode) && strtolower($display_mode) != 'default') {
+        if (strtolower($display_mode) != 'default') {
           $view_mode = $display_mode;
           break;
         }