diff --git a/common/src/java/com/example/android/common/dummydata/Cheeses.java b/common/src/java/com/example/android/common/dummydata/Cheeses.java
index 220d66a..783735c 100644
--- a/common/src/java/com/example/android/common/dummydata/Cheeses.java
+++ b/common/src/java/com/example/android/common/dummydata/Cheeses.java
@@ -174,6 +174,9 @@
         Random random = new Random();
         HashSet<String> items = new HashSet<String>();
 
+        // Make sure that don't infinity loop
+        count = Math.min(count, CHEESES.length);
+
         while (items.size() < count) {
             items.add(CHEESES[random.nextInt(CHEESES.length)]);
         }