diff --git a/ChangeLog.txt b/ChangeLog.txt
index ec082855..c3a6c60a 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -17,6 +17,7 @@ Broker:
 
 Library:
 - Fix reconnect delay backoff behaviour. Closes #1027.
+- Don't call on_disconnect() twice if keepalive tests fail. Closes #1067.
 
 Client:
 - Always print leading zeros in mosquitto_sub when output format is hex.
diff --git a/lib/loop.c b/lib/loop.c
index b8fd2c57..4b277752 100644
--- a/lib/loop.c
+++ b/lib/loop.c
@@ -292,31 +292,7 @@ int mosquitto_loop_misc(struct mosquitto *mosq)
 	if(!mosq) return MOSQ_ERR_INVAL;
 	if(mosq->sock == INVALID_SOCKET) return MOSQ_ERR_NO_CONN;
 
-	mosquitto__check_keepalive(mosq);
-	now = mosquitto_time();
-
-	if(mosq->ping_t && now - mosq->ping_t >= mosq->keepalive){
-		/* mosq->ping_t != 0 means we are waiting for a pingresp.
-		 * This hasn't happened in the keepalive time so we should disconnect.
-		 */
-		net__socket_close(mosq);
-		pthread_mutex_lock(&mosq->state_mutex);
-		if(mosq->state == mosq_cs_disconnecting){
-			rc = MOSQ_ERR_SUCCESS;
-		}else{
-			rc = MOSQ_ERR_KEEPALIVE;
-		}
-		pthread_mutex_unlock(&mosq->state_mutex);
-		pthread_mutex_lock(&mosq->callback_mutex);
-		if(mosq->on_disconnect){
-			mosq->in_callback = true;
-			mosq->on_disconnect(mosq, mosq->userdata, rc);
-			mosq->in_callback = false;
-		}
-		pthread_mutex_unlock(&mosq->callback_mutex);
-		return MOSQ_ERR_CONN_LOST;
-	}
-	return MOSQ_ERR_SUCCESS;
+	return mosquitto__check_keepalive(mosq);
 }
 
 
diff --git a/lib/util_mosq.c b/lib/util_mosq.c
index 56d8cb05..405cb390 100644
--- a/lib/util_mosq.c
+++ b/lib/util_mosq.c
@@ -46,9 +46,9 @@ Contributors:
 #endif
 
 #ifdef WITH_BROKER
-void mosquitto__check_keepalive(struct mosquitto_db *db, struct mosquitto *mosq)
+int mosquitto__check_keepalive(struct mosquitto_db *db, struct mosquitto *mosq)
 #else
-void mosquitto__check_keepalive(struct mosquitto *mosq)
+int mosquitto__check_keepalive(struct mosquitto *mosq)
 #endif
 {
 	time_t next_msg_out;
@@ -67,7 +67,7 @@ void mosquitto__check_keepalive(struct mosquitto *mosq)
 
 		log__printf(NULL, MOSQ_LOG_NOTICE, "Bridge connection %s has exceeded idle timeout, disconnecting.", mosq->id);
 		net__socket_close(db, mosq);
-		return;
+		return MOSQ_ERR_SUCCESS;
 	}
 #endif
 	pthread_mutex_lock(&mosq->msgtime_mutex);
@@ -108,9 +108,12 @@ void mosquitto__check_keepalive(struct mosquitto *mosq)
 				mosq->in_callback = false;
 			}
 			pthread_mutex_unlock(&mosq->callback_mutex);
+
+			return rc;
 #endif
 		}
 	}
+	return MOSQ_ERR_SUCCESS;
 }
 
 uint16_t mosquitto__mid_generate(struct mosquitto *mosq)
diff --git a/lib/util_mosq.h b/lib/util_mosq.h
index 0e65dd98..8e601a0f 100644
--- a/lib/util_mosq.h
+++ b/lib/util_mosq.h
@@ -26,9 +26,9 @@ Contributors:
 #endif
 
 #ifdef WITH_BROKER
-void mosquitto__check_keepalive(struct mosquitto_db *db, struct mosquitto *mosq);
+int mosquitto__check_keepalive(struct mosquitto_db *db, struct mosquitto *mosq);
 #else
-void mosquitto__check_keepalive(struct mosquitto *mosq);
+int mosquitto__check_keepalive(struct mosquitto *mosq);
 #endif
 uint16_t mosquitto__mid_generate(struct mosquitto *mosq);
 FILE *mosquitto__fopen(const char *path, const char *mode, bool restrict_read);