diff --git a/ChangeLog.txt b/ChangeLog.txt
index 6b3f8716..5282e1dc 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,10 @@
+1.6.4 - 2019xxxx
+================
+
+Broker:
+- Fix persistent clients being incorrectly expired on Raspberry Pis.
+  Closes #1272.
+
 1.6.3 - 20190618
 ================
 
diff --git a/src/session_expiry.c b/src/session_expiry.c
index 057e032c..68540a71 100644
--- a/src/session_expiry.c
+++ b/src/session_expiry.c
@@ -94,7 +94,9 @@ void session_expiry__check(struct mosquitto_db *db, time_t now)
 	last_check = now;
 
 	DL_FOREACH_SAFE(expiry_list, item, tmp){
-		if(item->context->session_expiry_time < now){
+		if(item->context->session_expiry_interval != UINT32_MAX
+				&& item->context->session_expiry_time < now){
+
 			context = item->context;
 			session_expiry__remove(context);