diff --git a/src/mod/languages/mod_lua/freeswitch_lua.cpp b/src/mod/languages/mod_lua/freeswitch_lua.cpp
index e30eb8b697..0f7ef7750a 100644
--- a/src/mod/languages/mod_lua/freeswitch_lua.cpp
+++ b/src/mod/languages/mod_lua/freeswitch_lua.cpp
@@ -133,10 +133,18 @@ static switch_status_t lua_hanguphook(switch_core_session_t *session_hungup)
 	CoreSession *coresession = NULL;
 	switch_channel_state_t state = switch_channel_get_state(channel);
 
-	if ((coresession = (CoreSession *) switch_channel_get_private(channel, "CoreSession"))) {
-		if (coresession->hook_state != state) {
+	if (session_hungup) {
+
+		channel = switch_core_session_get_channel(session_hungup);
+
+		if (channel) {
+			coresession = (CoreSession *) switch_channel_get_private(channel, "CoreSession");
+		}
+		
+		if (coresession && coresession->allocated && (state == CS_HANGUP || state == CS_ROUTING) && coresession->hook_state != state) {
 			coresession->hook_state = state;
 			coresession->check_hangup_hook();
+			switch_core_event_hook_remove_state_change(session_hungup, lua_hanguphook);
 		}
 	}