diff --git a/app/src/main/java/com/luca0n/joguitos/pluck/util/ApiUtil.java b/app/src/main/java/com/luca0n/joguitos/pluck/util/ApiUtil.java
index de8d6b3..cc3883b 100644
--- a/app/src/main/java/com/luca0n/joguitos/pluck/util/ApiUtil.java
+++ b/app/src/main/java/com/luca0n/joguitos/pluck/util/ApiUtil.java
@@ -43,6 +43,7 @@ import java.net.Proxy;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.Collections;
 
 import com.luca0n.joguitos.pluck.R;
 import com.luca0n.joguitos.pluck.PluckApplication;
@@ -127,7 +128,11 @@ public class ApiUtil {
 
 		ArrayList<TriviaQuestion> questions = new ArrayList<>();
 
+		int elements = 0;
+
 		for (JsonElement element : jsonArray) {
+			if (elements++ == filters.getAmount())
+				break;
 			JsonObject object = element.getAsJsonObject();
 			TriviaType type = TriviaType.get(object.get("type").getAsString());
 
@@ -152,6 +157,9 @@ public class ApiUtil {
 		if (questions.size() == 0)
 			throw new NoTriviaResultsException();
 
+		// Shuffle the question array.
+		Collections.shuffle(questions);
+
 		return questions;
 	}
 }