diff --git a/system/settings/settings.xml b/system/settings/settings.xml
index 530000e1ebfd0..a73dad05a00c4 100644
--- a/system/settings/settings.xml
+++ b/system/settings/settings.xml
@@ -1196,7 +1196,7 @@
1
1
- 14
+ 31
17999
diff --git a/xbmc/epg/GUIEPGGridContainer.h b/xbmc/epg/GUIEPGGridContainer.h
index 981ca0d7fc738..bd7fa1b40e47f 100644
--- a/xbmc/epg/GUIEPGGridContainer.h
+++ b/xbmc/epg/GUIEPGGridContainer.h
@@ -30,7 +30,7 @@
namespace EPG
{
#define MAXCHANNELS 20
- #define MAXBLOCKS (16 * 24 * 60 / 5) //! 16 days of 5 minute blocks (14 days for upcoming data + 1 day for past data + 1 day for fillers)
+ #define MAXBLOCKS (33 * 24 * 60 / 5) //! 33 days of 5 minute blocks (31 days for upcoming data + 1 day for past data + 1 day for fillers)
struct GridItemsPtr
{