diff --git a/modules/default/compliments/compliments.js b/modules/default/compliments/compliments.js
index 6cca95fc..cd87bb78 100644
--- a/modules/default/compliments/compliments.js
+++ b/modules/default/compliments/compliments.js
@@ -98,11 +98,11 @@ Module.register("compliments", {
 		var hour = moment().hour();
 		var compliments = null;
 
-		if (hour >= 3 && hour < 12) {
+		if (hour >= 3 && hour < 12 && this.config.compliments.hasOwnProperty("morning")) {
 			compliments = this.config.compliments.morning.slice(0);
-		} else if (hour >= 12 && hour < 17) {
+		} else if (hour >= 12 && hour < 17 && this.config.compliments.hasOwnProperty("afternoon")) {
 			compliments = this.config.compliments.afternoon.slice(0);
-		} else {
+		} else if(this.config.compliments.hasOwnProperty("evening")) {
 			compliments = this.config.compliments.evening.slice(0);
 		}