diff --git a/demo-shell-ng2/app/components/files/files.component.ts b/demo-shell-ng2/app/components/files/files.component.ts
index 388918f659..32dcb35b62 100644
--- a/demo-shell-ng2/app/components/files/files.component.ts
+++ b/demo-shell-ng2/app/components/files/files.component.ts
@@ -120,7 +120,7 @@ export class FilesComponent implements OnInit {
         return this.acceptedFilesTypeShow;
     }
 
-    toggleVersioning(){
+    toggleVersioning() {
         this.versioning = !this.versioning;
         return this.versioning;
     }
diff --git a/ng2-components/ng2-alfresco-viewer/src/viewer.component.html b/ng2-components/ng2-alfresco-viewer/src/viewer.component.html
index 2b15543f3b..e60f8e5401 100644
--- a/ng2-components/ng2-alfresco-viewer/src/viewer.component.html
+++ b/ng2-components/ng2-alfresco-viewer/src/viewer.component.html
@@ -48,13 +48,13 @@
                         <div id="viewer-content-container" class="viewer-content-container mdl-cell" >
                         <!-- Start View Switch-->
                             <div *ngIf="isPdf()">
-                                <pdf-viewer [showToolbar]="showToolbar" [urlFile]="urlFile" [nameFile]="displayName" ></pdf-viewer>
+                                <pdf-viewer [showToolbar]="showToolbar" [urlFile]="urlFileContent" [nameFile]="displayName" ></pdf-viewer>
                             </div>
                             <div class="center-element" *ngIf="isImage()" >
-                                <img-viewer [urlFile]="urlFile" [nameFile]="displayName"></img-viewer>
+                                <img-viewer [urlFile]="urlFileContent" [nameFile]="displayName"></img-viewer>
                             </div>
                             <div *ngIf="!supportedExtension()">
-                                <not-supported-format [urlFile]="urlFile" [nameFile]="displayName" ></not-supported-format>
+                                <not-supported-format [urlFile]="urlFileContent" [nameFile]="displayName" ></not-supported-format>
                             </div>
                         <!-- End View Switch -->
                         </div>
diff --git a/ng2-components/ng2-alfresco-viewer/src/viewer.component.ts b/ng2-components/ng2-alfresco-viewer/src/viewer.component.ts
index 4fb0dfc7f3..893aa4f71f 100644
--- a/ng2-components/ng2-alfresco-viewer/src/viewer.component.ts
+++ b/ng2-components/ng2-alfresco-viewer/src/viewer.component.ts
@@ -51,6 +51,8 @@ export class ViewerComponent {
     @Output()
     showViewerChange: EventEmitter<boolean> = new EventEmitter<boolean>();
 
+    urlFileContent: string;
+
     otherMenu: any;
 
     displayName: string;
@@ -76,11 +78,12 @@ export class ViewerComponent {
                     let filenameFromUrl = this.getFilenameFromUrl(this.urlFile);
                     this.displayName = filenameFromUrl ? filenameFromUrl : '';
                     this.extension = this.getFileExtension(filenameFromUrl);
+                    this.urlFileContent = this.urlFile;
                 } else if (this.fileNodeId) {
                     this.authService.getAlfrescoApi().nodes.getNodeInfo(this.fileNodeId).then((data) => {
                         this.mimeType = data.content.mimeType;
                         this.displayName = data.name;
-                        this.urlFile = this.authService.getAlfrescoApi().content.getContentUrl(data.id);
+                        this.urlFileContent = this.authService.getAlfrescoApi().content.getContentUrl(data.id);
                         this.loaded = true;
                     }, function (error) {
                         console.log('This node does not exist');