diff --git a/modules/leaflet_views/src/Plugin/views/style/LeafletMap.php b/modules/leaflet_views/src/Plugin/views/style/LeafletMap.php
index 2746f39..6c9431b 100644
--- a/modules/leaflet_views/src/Plugin/views/style/LeafletMap.php
+++ b/modules/leaflet_views/src/Plugin/views/style/LeafletMap.php
@@ -990,7 +990,7 @@ class LeafletMap extends StylePluginBase implements ContainerFactoryPluginInterf
                       // Normal rendering via view/row fields
                       // (with labels options, formatters, classes, etc.).
                       $render_row = [
-                        "markup" => $this->view->rowPlugin->render($result),
+                        "markup" => !empty($result) ? $this->view->rowPlugin->render($result) : '',
                       ];
                       $popup_content = !empty($this->options['description_field']) ? $this->renderer->renderPlain($render_row) : '';
                       break;