diff --git a/src/main/webapp/app/entities/project/project-detail.component.ts b/src/main/webapp/app/entities/project/project-detail.component.ts
index 2261b4e87..0de866fc3 100644
--- a/src/main/webapp/app/entities/project/project-detail.component.ts
+++ b/src/main/webapp/app/entities/project/project-detail.component.ts
@@ -15,7 +15,7 @@ interface TabOptions {
     selector: 'jhi-project-detail',
     changeDetection: ChangeDetectionStrategy.OnPush,
     templateUrl: './project-detail.component.html',
-    styleUrls: ['project-detail.component.scss', '../../../content/scss/_print.scss'],
+    styleUrls: ['project-detail.component.scss'],
 })
 export class ProjectDetailComponent implements OnInit, OnDestroy {
     private subscription = new Subscription();
diff --git a/src/main/webapp/app/layouts/main/main.component.ts b/src/main/webapp/app/layouts/main/main.component.ts
index 9348fd838..d816b41ce 100644
--- a/src/main/webapp/app/layouts/main/main.component.ts
+++ b/src/main/webapp/app/layouts/main/main.component.ts
@@ -28,6 +28,5 @@ export class JhiMainComponent implements OnInit {
             }
         });
        this.isPrintLocked$ = this.printService.isPrintLocked$;
-       //this.isPrintLocked$.subscribe(setTo => console.log("now we updated main.html"));
     }
 }
diff --git a/src/main/webapp/app/shared/subject/subject-pair-dialog.component.html b/src/main/webapp/app/shared/subject/subject-pair-dialog.component.html
index 7fe1929cf..270435d1a 100644
--- a/src/main/webapp/app/shared/subject/subject-pair-dialog.component.html
+++ b/src/main/webapp/app/shared/subject/subject-pair-dialog.component.html
@@ -8,7 +8,7 @@
                 (click)="clear()">×
         </button>
     </div>
-    <div class="modal-body print">
+    <div class="modal-body">
         <div class="form-group">
             <div>
                 <label for="login" class="form-control-label"
diff --git a/src/main/webapp/app/shared/subject/subject-pair-dialog.component.ts b/src/main/webapp/app/shared/subject/subject-pair-dialog.component.ts
index 439b66ad8..2b74524b9 100644
--- a/src/main/webapp/app/shared/subject/subject-pair-dialog.component.ts
+++ b/src/main/webapp/app/shared/subject/subject-pair-dialog.component.ts
@@ -14,7 +14,6 @@ import { SubjectPopupService } from './subject-popup.service';
 import { Subject } from './subject.model';
 import { ObservablePopupComponent } from '../util/observable-popup.component';
 import { map, switchMap, tap } from 'rxjs/operators';
-import { JhiMainComponent } from '../../layouts/main/main.component';
 import { PrintService } from '../util/print.service';
 
 @Component({
@@ -41,18 +40,9 @@ export class SubjectPairDialogComponent implements OnInit, OnDestroy {
                 @Inject(DOCUMENT) private doc) {
         this.authorities = ['ROLE_USER', 'ROLE_SYS_ADMIN'];
     }
-    async exportHtmlToPDF() {
-        // let pp: PrintService = this.printService;
-        // window.onafterprint = function(){
-        //     console.log("Printing completed...");
-        //     //pp.togglePrintLock().then(_ => {})
-        // }
-
-        this.printService.setPrintLockTo(true);
-        await new Promise(r => setTimeout(r, 0.000000000000000000000000000000000000000000000000000001));
-        window.print()
-        this.printService.setPrintLockTo(false);
 
+    exportHtmlToPDF() {
+        window.print();
     }
 
     ngOnInit() {
@@ -61,10 +51,14 @@ export class SubjectPairDialogComponent implements OnInit, OnDestroy {
         }
         this.loadInconsolataFont();
         this.subscriptions.add(this.fetchOAuthClients());
+
+        // Add print-lock to exclude the background from being included in print commands
+        this.printService.setPrintLockTo(true);
     }
 
     ngOnDestroy() {
         this.subscriptions.unsubscribe();
+        this.printService.setPrintLockTo(false);
     }
 
     private fetchOAuthClients(): Subscription {
diff --git a/src/main/webapp/app/shared/subject/subject.component.ts b/src/main/webapp/app/shared/subject/subject.component.ts
index b5f080b1a..d965cf541 100644
--- a/src/main/webapp/app/shared/subject/subject.component.ts
+++ b/src/main/webapp/app/shared/subject/subject.component.ts
@@ -18,7 +18,7 @@ import { regularSortOrder, SortOrder, SortOrderImpl } from '../util/sort-util';
     selector: 'jhi-subjects',
     changeDetection: ChangeDetectionStrategy.OnPush,
     templateUrl: './subject.component.html',
-    styleUrls: ['./subject.component.scss', '../../../content/scss/_print.scss'],
+    styleUrls: ['./subject.component.scss'],
 })
 export class SubjectComponent implements OnInit, OnDestroy, OnChanges {
     private subscriptions: Subscription = new Subscription();
diff --git a/src/main/webapp/app/shared/util/print.service.ts b/src/main/webapp/app/shared/util/print.service.ts
index 21f6b7f8e..89453ce09 100644
--- a/src/main/webapp/app/shared/util/print.service.ts
+++ b/src/main/webapp/app/shared/util/print.service.ts
@@ -8,9 +8,7 @@ export class PrintService {
 
     constructor(
     ) {
-        this.isPrintLocked$.subscribe(isPrintLocked => {
-            //console.log(`isPrintlocked: ${isPrintLocked}`)
-        })
+        this.isPrintLocked$.subscribe();
     }
 
     setPrintLockTo(setTo: boolean) {