+       ast_setstate(oldowner, AST_STATE_DOWN);
+
        p->owner = NULL;
        ast_channel_tech_pvt_set(ast, NULL);

@@ -7457,7 +7462,7 @@ static int sip_hangup(struct ast_channel *ast)
                                }

                                /* Send a hangup */
-                               if (ast_channel_state(oldowner) == AST_STATE_UP || p->invitereplaces) {
+                               if (oldstate == AST_STATE_UP || p->invitereplaces) {
                                        transmit_request_with_auth(p, SIP_BYE, 0, XMIT_RELIABLE, 1);
                                }