diff --git a/src/session_server.c b/src/session_server.c
index 1894cae..7d17f95 100644
--- a/src/session_server.c
+++ b/src/session_server.c
@@ -1604,7 +1604,7 @@
         *session = NULL;
         return msgtype;
     }
-    (*session)->session_start = time(NULL);
+    (*session)->session_start = (*session)->last_rpc = time(NULL);
     (*session)->status = NC_STATUS_RUNNING;
 
     return msgtype;
@@ -1728,7 +1728,7 @@
     if (msgtype != NC_MSG_HELLO) {
         goto fail;
     }
-    (*session)->session_start = time(NULL);
+    (*session)->session_start = (*session)->last_rpc = time(NULL);
     (*session)->status = NC_STATUS_RUNNING;
 
     return msgtype;
diff --git a/src/session_server_ssh.c b/src/session_server_ssh.c
index 1fb7823..ff90ad0 100644
--- a/src/session_server_ssh.c
+++ b/src/session_server_ssh.c
@@ -1217,7 +1217,7 @@
         return msgtype;
     }
 
-    new_session->session_start = time(NULL);
+    new_session->session_start = new_session->last_rpc = time(NULL);
     new_session->status = NC_STATUS_RUNNING;
     *session = new_session;
 
@@ -1285,7 +1285,7 @@
         return msgtype;
     }
 
-    new_session->session_start = time(NULL);
+    new_session->session_start = new_session->last_rpc = time(NULL);
     new_session->status = NC_STATUS_RUNNING;
     *session = new_session;