diff --git a/projects/angular-token/src/lib/angular-token.service.spec.ts b/projects/angular-token/src/lib/angular-token.service.spec.ts
index 0ebf372f..ef461b90 100644
--- a/projects/angular-token/src/lib/angular-token.service.spec.ts
+++ b/projects/angular-token/src/lib/angular-token.service.spec.ts
@@ -1,6 +1,7 @@
 import { HttpClientModule } from '@angular/common/http';
 import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
 import { TestBed } from '@angular/core/testing';
+import { Router } from '@angular/router';
 
 import { AngularTokenModule } from './angular-token.module';
 import { AngularTokenService } from './angular-token.service';
@@ -145,7 +146,11 @@ describe('AngularTokenService', () => {
         AngularTokenModule.forRoot(serviceConfig)
       ],
       providers: [
-        AngularTokenService
+        AngularTokenService,
+        {
+          provide: Router,
+          useValue: jasmine.createSpyObj('Router', ['navigate'])
+        }
       ]
     });
 
@@ -527,4 +532,54 @@ describe('AngularTokenService', () => {
       req.flush( userData, { headers: tokenHeaders } );
     });
   });
+
+  describe('#canActivate', () => {
+    let router: Router;
+
+    beforeEach(() => {
+      initService({
+        signInRedirect: '/'
+      });
+
+      router = TestBed.get(Router);
+    });
+
+    describe('when the user is thought to be authenticated', () => {
+      beforeEach(() => {
+        (service as any).authData.next({ ...service.currentAuthData, ...{ expiry: Date.now() + 100_000_000 } });
+      });
+
+       it('returns true', () => {
+        expect(service.canActivate(null, null)).toBeTruthy();
+      });
+    });
+
+     describe('when the user is thought to be unauthenticated', () => {
+      it('returns false', () => {
+        expect(service.canActivate(null, { url: '/some/route' } as any)).toBeFalsy();
+      });
+
+       it('redirects to the configured route', () => {
+        service.canActivate(null, { url: '/some/route' } as any);
+
+         expect(router.navigate).toHaveBeenCalledWith([service.tokenOptions.signInRedirect]);
+      });
+
+       it('adds the desired route to local storage when configured', () => {
+         const url = '/some/route';
+         service.tokenOptions = { ...service.tokenOptions, ...{ signInStoredUrlStorageKey: 'redirectTo' }};
+         service.canActivate(null, { url } as any);
+
+         expect(localStorage.setItem).toHaveBeenCalledWith(service.tokenOptions.signInStoredUrlStorageKey, url);
+      });
+
+       it('does not add the desired route to local storage when not configured', () => {
+        const url = '/some/route';
+        service.tokenOptions = { ...service.tokenOptions, ...{ signInStoredUrlStorageKey: null }};
+        service.canActivate(null, { url } as any);
+
+         expect(localStorage.setItem).not.toHaveBeenCalled();
+      });
+    });
+  });
 });
diff --git a/projects/angular-token/src/lib/angular-token.service.ts b/projects/angular-token/src/lib/angular-token.service.ts
index c230efce..4126cf80 100755
--- a/projects/angular-token/src/lib/angular-token.service.ts
+++ b/projects/angular-token/src/lib/angular-token.service.ts
@@ -138,32 +138,22 @@ export class AngularTokenService implements CanActivate {
   }
 
   userSignedIn(): boolean {
-    if (this.authData.value == null) {
-      return false;
-    } else {
-      return true;
-    }
+    return !!this.authData.value;
   }
 
-  canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): boolean {
-    if (this.userSignedIn()) {
-      return true;
-    } else {
-      // Store current location in storage (usefull for redirection after signing in)
-      if (this.options.signInStoredUrlStorageKey) {
-        this.localStorage.setItem(
-          this.options.signInStoredUrlStorageKey,
-          state.url
-        );
-      }
+  canActivate(_route: ActivatedRouteSnapshot, state: RouterStateSnapshot): boolean {
+    const expiration = this.userSignedIn() && !!this.authData.value.expiry ? (+this.authData.value.expiry * 1000) : 0;
+    const authenticated = Date.now() < expiration;
 
-      // Redirect user to sign in if signInRedirect is set
-      if (this.router && this.options.signInRedirect) {
-        this.router.navigate([this.options.signInRedirect]);
+    if (!authenticated) {
+      if (!!this.options.signInStoredUrlStorageKey) {
+        localStorage.setItem(this.options.signInStoredUrlStorageKey, state.url);
       }
 
-      return false;
+      this.router.navigate([this.options.signInRedirect]);
     }
+
+    return authenticated;
   }