diff --git a/main/taskprocessor.c b/main/taskprocessor.c
index 6793542abf3ff16738e8ee6492acc3c5eb497610..cf82efff2d771f770a98af65efabb721d9adf097 100644
--- a/main/taskprocessor.c
+++ b/main/taskprocessor.c
@@ -112,7 +112,13 @@ struct ast_taskprocessor_listener {
 	void *user_data;
 };
 
-#define TPS_MAX_BUCKETS 7
+#ifdef LOW_MEMORY
+#define TPS_MAX_BUCKETS 61
+#else
+/*! \brief Number of buckets in the tps_singletons container. */
+#define TPS_MAX_BUCKETS 1567
+#endif
+
 /*! \brief tps_singletons is the astobj2 container for taskprocessor singletons */
 static struct ao2_container *tps_singletons;