diff --git a/src/session/session.c b/src/session/session.c
index e51f545d243..9e43a535157 100644
--- a/src/session/session.c
+++ b/src/session/session.c
@@ -944,8 +944,6 @@ session_remove_expired_sessions (THREAD_ENTRY * thread_p)
 	      /* Now we can destroy this session */
 	      assert (state->ref_count == 0);
 
-	      expired_sid_buffer[n_expired_sids++] = state->id;
-
 	      if (state->is_keep_session == true)
 		{
 		  /* keep session */
@@ -954,6 +952,8 @@ session_remove_expired_sessions (THREAD_ENTRY * thread_p)
 		}
 	      else
 		{
+		  expired_sid_buffer[n_expired_sids++] = state->id;
+
 		  /* Destroy the session related resources like session parameters */
 		  (void) session_state_uninit (state);
 		}
diff --git a/win/cubridcs/cubridcs.def b/win/cubridcs/cubridcs.def
index ac18a59f9dc..2f65bc0c68d 100644
--- a/win/cubridcs/cubridcs.def
+++ b/win/cubridcs/cubridcs.def
@@ -299,6 +299,8 @@ EXPORTS
     db_restart_ex
     db_set_session_id
     db_get_session_id
+    db_set_keep_session
+    db_get_keep_session
     db_find_or_create_session
     db_end_session
     db_set_connect_status
diff --git a/win/cubridsa/cubridsa.def b/win/cubridsa/cubridsa.def
index c1d922ba23e..1034e05dbf3 100644
--- a/win/cubridsa/cubridsa.def
+++ b/win/cubridsa/cubridsa.def
@@ -43,6 +43,8 @@ EXPORTS
     db_restart_ex
     db_set_session_id
     db_get_session_id
+    db_set_keep_session
+    db_get_keep_session
     db_find_or_create_session
     db_end_session
     db_set_server_session_key