diff --git a/frontend/src/components/SessionLogoutTimeout.spec.js b/frontend/src/components/SessionLogoutTimeout.spec.js
index 0f5d21d36..bd6911d13 100644
--- a/frontend/src/components/SessionLogoutTimeout.spec.js
+++ b/frontend/src/components/SessionLogoutTimeout.spec.js
@@ -62,12 +62,16 @@ describe('SessionLogoutTimeout', () => {
         })
       })
 
-      describe('token is expired', () => {
+      describe('token is expired for several seconds', () => {
         beforeEach(() => {
           mocks.$store.state.tokenTime = setTokenTime(-60)
           wrapper = Wrapper()
         })
 
+        it('has value for remaining seconds equal 0', () => {
+          expect(wrapper.tokenExpiresInSeconds === 0)
+        })
+
         it('emits logout', () => {
           expect(wrapper.emitted('logout')).toBeTruthy()
         })
diff --git a/frontend/src/components/SessionLogoutTimeout.vue b/frontend/src/components/SessionLogoutTimeout.vue
index 1e5a27998..1ebff752a 100644
--- a/frontend/src/components/SessionLogoutTimeout.vue
+++ b/frontend/src/components/SessionLogoutTimeout.vue
@@ -65,7 +65,7 @@ export default {
         this.$timer.restart('tokenExpires')
         this.$bvModal.show('modalSessionTimeOut')
       }
-      if (this.tokenExpiresInSeconds <= 0) {
+      if (this.tokenExpiresInSeconds === 0) {
         this.$timer.stop('tokenExpires')
         this.$emit('logout')
       }
@@ -90,7 +90,10 @@ export default {
   },
   computed: {
     tokenExpiresInSeconds() {
-      return Math.floor((new Date(this.$store.state.tokenTime * 1000).getTime() - this.now) / 1000)
+      const remainingSecs = Math.floor(
+        (new Date(this.$store.state.tokenTime * 1000).getTime() - this.now) / 1000,
+      )
+      return remainingSecs <= 0 ? 0 : remainingSecs
     },
   },
   beforeDestroy() {