diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/data/BarDataSet.java b/MPChartLib/src/main/java/com/github/mikephil/charting/data/BarDataSet.java
index 496f4046f8..ed076dc94a 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/data/BarDataSet.java
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/data/BarDataSet.java
@@ -38,9 +38,7 @@ public class BarDataSet extends BarLineScatterCandleBubbleDataSet<BarEntry> impl
     /**
      * array of labels used to describe the different values of the stacked bars
      */
-    private String[] mStackLabels = new String[]{
-            "Stack"
-    };
+    private String[] mStackLabels = new String[]{};
 
     public BarDataSet(List<BarEntry> yVals, String label) {
         super(yVals, label);
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/LegendRenderer.java b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/LegendRenderer.java
index 4e7e5d6448..5d49580561 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/LegendRenderer.java
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/LegendRenderer.java
@@ -101,10 +101,19 @@ public void computeLegend(ChartData<?> data) {
                     IBarDataSet bds = (IBarDataSet) dataSet;
                     String[] sLabels = bds.getStackLabels();
 
-                    for (int j = 0; j < clrs.size() && j < bds.getStackSize(); j++) {
+                    int minEntries = Math.min(clrs.size(), bds.getStackSize());
+
+                    for (int j = 0; j < minEntries; j++) {
+                        String label;
+                        if (sLabels.length > 0) {
+                            int labelIndex = j % minEntries;
+                            label = labelIndex < sLabels.length ? sLabels[labelIndex] : null;
+                        } else {
+                            label = null;
+                        }
 
                         computedEntries.add(new LegendEntry(
-                                sLabels[j % sLabels.length],
+                                label,
                                 dataSet.getForm(),
                                 dataSet.getFormSize(),
                                 dataSet.getFormLineWidth(),