diff --git a/channels/chan_agent.c b/channels/chan_agent.c
index 2e26d7c1c321e6e130de544f94079d720d651aa2..1c440f3b80183e2aa33f1b4d76432063dacc68ab 100644
--- a/channels/chan_agent.c
+++ b/channels/chan_agent.c
@@ -771,14 +771,16 @@ static int agent_hangup(struct ast_channel *ast)
 			ast_channel_lock(p->chan);
 			ast_softhangup(p->chan, AST_SOFTHANGUP_EXPLICIT);
 			ast_channel_unlock(p->chan);
-		} else {
+		} else if (p->loginstart) {
 			ast_channel_lock(p->chan);
 			ast_moh_start(p->chan, p->moh);
 			ast_channel_unlock(p->chan);
 		}
 	}
 	ast_mutex_unlock(&p->lock);
-	ast_device_state_changed("Agent/%s", p->agent);
+	/* Only register a device state change if the agent is still logged in */
+	if (p->loginstart)
+		ast_device_state_changed("Agent/%s", p->agent);
 
 	if (p->pending) {
 		AST_LIST_LOCK(&agents);