diff --git a/src/main/java/nl/komtek/gpi/controllers/GunbotProxyController.java b/src/main/java/nl/komtek/gpi/controllers/GunbotProxyController.java
index 5e61186..a88cfec 100644
--- a/src/main/java/nl/komtek/gpi/controllers/GunbotProxyController.java
+++ b/src/main/java/nl/komtek/gpi/controllers/GunbotProxyController.java
@@ -98,6 +98,9 @@ public class GunbotProxyController {
 		}
 		String result = gunbotProxyService.getTradeHistory(market);
 
+		if (result.equals("[]")){
+			return result;
+		}
 		JsonElement jelement = new JsonParser().parse(result);
 		JsonObject jobject = jelement.getAsJsonObject();
 		JsonArray jarray = jobject.getAsJsonArray(currencyPair);