diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts
index 841a86ff0..af4ebd150 100644
--- a/src/app/home/home.page.ts
+++ b/src/app/home/home.page.ts
@@ -6,7 +6,7 @@ import { Event } from '../models/event.model';
 import { ProcessesService } from '../services/processes.service';
 import { NotificationsService } from '../services/notifications.service';
 import { ModalController, AlertController, AnimationController, Platform } from '@ionic/angular';
-import { NavigationExtras,Router } from '@angular/router';
+import { NavigationExtras,Router,ActivatedRoute } from '@angular/router';
 import { ToastService } from '../services/toast.service';
 
 @Component({
@@ -53,7 +53,8 @@ export class HomePage implements OnInit {
     private toastService: ToastService,
     private animationController: AnimationController,
     private notificatinsservice: NotificationsService,
-    private platform: Platform) {
+    private platform: Platform,
+    private activeroute: ActivatedRoute) {
 
     router.events.subscribe((val) => {
       document.querySelectorAll('ion-modal').forEach((e) => e.remove())
@@ -66,6 +67,7 @@ export class HomePage implements OnInit {
   }
 
   ngOnInit() {
+    console.log('Active route ',this.router.url)
     if(this.platform.is('desktop') || this.platform.is('mobileweb')) {
       console.log('Notifications not supported')
     } else {
diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.page.html b/src/app/pages/gabinete-digital/pedidos/pedidos.page.html
index 4bdf3d3bd..586f92eed 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedidos.page.html
+++ b/src/app/pages/gabinete-digital/pedidos/pedidos.page.html
@@ -77,7 +77,7 @@
           <ion-item 
               class="expediente ion-no-padding"  
               *ngFor = "let task of deferimentoList"
-              (click)="viewPedidoDetail(task.SerialNumber)"
+              (click)="goToPedido(task.SerialNumber)"
               >
               <!-- (click)="viewExpedientDetail(task.SerialNumber)" -->
               <!--  [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
diff --git a/src/app/services/notifications.service.ts b/src/app/services/notifications.service.ts
index 718a0aaa6..9d7bb32a2 100644
--- a/src/app/services/notifications.service.ts
+++ b/src/app/services/notifications.service.ts
@@ -1,5 +1,6 @@
 ///<reference path="../../../plugins/cordova-plugin-mfp-push/typings/mfppush.d.ts" />
 import { Injectable, NgZone } from '@angular/core';
+import { ActivatedRoute } from '@angular/router'
 import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
 import { environment } from 'src/environments/environment';
 import { StorageService } from 'src/app/services/storage.service';
@@ -26,7 +27,8 @@ export class NotificationsService {
     private platform: Platform,
     private router: Router,
     private toastService: ToastService,
-    private zone: NgZone) { }
+    private zone: NgZone,
+    private activeroute: ActivatedRoute) { }
 
   getTokenByUserIdAndId(user, userID) {
     const geturl = environment.apiURL + 'notifications/user/' + userID;
@@ -135,25 +137,15 @@ export class NotificationsService {
       this.zone.run(() => this.router.navigate(['/home/gabinete-digital/event-list/approve-event',data.IdObject, 'gabinete-digital']));
     }else if (data.Service === "gabinete-digital" && data.Object === "despachos") {
       
-      this.zone.run(() => this.router.navigate(['/home/gabinete-digital/despachos',data.IdObject,'gabinete-digital']));
+      this.zone.run(() => this.router.navigate(['/home/gabinete-digital/despachos',data.IdObject,'gabinete-digital'],{replaceUrl: true}));
     }
     else if (data.Service === "gabinete-digital" && data.Object === "parecer") {
-      let navigationExtras: NavigationExtras = {
-        queryParams: {
-          enterAnimation: "",
-          serialNumber: data.IdObject,
-        }
-      };
-      this.zone.run(() => this.router.navigate(['/home/gabinete-digital/pedidos/pedido'], navigationExtras));
+
+      this.zone.run(() => this.router.navigate(['/home/gabinete-digital/pedidos',data.IdObject,'gabinete-digital']));
     }
     else if (data.Service === "gabinete-digital" && data.Object === "deferimento") {
-      let navigationExtras: NavigationExtras = {
-        queryParams: {
-          enterAnimation: "",
-          serialNumber: data.IdObject,
-        }
-      };
-      this.zone.run(() => this.router.navigate(['/home/gabinete-digital/pedidos/pedido'], navigationExtras));
+      
+      this.zone.run(() => this.router.navigate(['/home/gabinete-digital/pedidos',data.IdObject,'gabinete-digital']));
     }
     else if (data.Service === "gabinete-digital" && data.Object === "despachos-pr") {