Index: viewfield.theme.inc
===================================================================
--- viewfield.theme.inc	(revision 117)
+++ viewfield.theme.inc	(working copy)
@@ -125,7 +125,10 @@
       $view->set_arguments($view_args);
       if ($view->access(array($display), $user)) {
         $view->execute_display();
-        $output .= $view->render();
+        $current_display = $view->display[$view->current_display];
+        if (!empty($view->result) || $current_display->handler->get_option('empty') || !empty($view->style_plugin->definition['even empty'])) {
+          $output .= $view->render();
+        }
       }
     }
     // This node is "safe" again.