1 files changed, 16 insertions, 2 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindow.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindow.java
index 7452ab8fac..aaa5525b4d 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindow.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindow.java
@@ -3,6 +3,7 @@ package com.mapbox.mapboxsdk.annotations;
 import android.content.res.Resources;
 import android.graphics.PointF;
 import android.support.annotation.LayoutRes;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -222,9 +223,22 @@ public class InfoWindow {
         }
         mMapboxMap = new WeakReference<>(mapboxMap);
         String title = overlayItem.getTitle();
-        ((TextView) view.findViewById(R.id.infowindow_title)).setText(title);
+        TextView titleTextView = ((TextView) view.findViewById(R.id.infowindow_title));
+        if (!TextUtils.isEmpty(title)) {
+            titleTextView.setText(title);
+            titleTextView.setVisibility(View.VISIBLE);
+        } else {
+            titleTextView.setVisibility(View.GONE);
+        }
+
         String snippet = overlayItem.getSnippet();
-        ((TextView) view.findViewById(R.id.infowindow_description)).setText(snippet);
+        TextView snippetTextView = ((TextView) view.findViewById(R.id.infowindow_description));
+        if (!TextUtils.isEmpty(snippet)) {
+            snippetTextView.setText(snippet);
+            snippetTextView.setVisibility(View.VISIBLE);
+        } else {
+            snippetTextView.setVisibility(View.GONE);
+        }
     }
 
     InfoWindow setBoundMarker(Marker boundMarker) {