diff --git a/src/frontend/app/attachments/attachment-create/attachment-create.component.ts b/src/frontend/app/attachments/attachment-create/attachment-create.component.ts
index e5029e56609adbd1fef638e6eba1de922384f4ff..581526f73f46b366b33c0e6c59c2281623032d5b 100644
--- a/src/frontend/app/attachments/attachment-create/attachment-create.component.ts
+++ b/src/frontend/app/attachments/attachment-create/attachment-create.component.ts
@@ -1,10 +1,10 @@
-import { Component, OnInit, Input, EventEmitter, Output, Inject, ViewChildren, QueryList, ViewChild } from '@angular/core';
+import { Component, OnInit, Input, Inject, ViewChildren, QueryList} from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 import { LANG } from '../../translate.component';
-import { catchError, tap, finalize, exhaustMap, filter } from 'rxjs/operators';
-import { of, forkJoin, Subject } from 'rxjs';
+import {catchError, tap, filter, distinctUntilChanged} from 'rxjs/operators';
+import { of } from 'rxjs';
 import { NotificationService } from '../../notification.service';
-import { MatDialog, MAT_DIALOG_DATA, MatDialogRef, MatTabGroup } from '@angular/material';
+import { MatDialog, MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
 import { AppService } from '../../../service/app.service';
 import { DocumentViewerComponent } from '../../viewer/document-viewer.component';
 import { SortPipe } from '../../../plugins/sorting.pipe';
@@ -252,6 +252,7 @@ export class AttachmentCreateComponent implements OnInit {
 
     onSubmit(mode: string = 'default') {
         this.appDocumentViewer.toArray()[this.indexTab].getFile().pipe(
+            distinctUntilChanged(),
             tap((data) => {
                 this.attachments[this.indexTab].encodedFile.setValue(data.content);
                 this.attachments[this.indexTab].format.setValue(data.format);
@@ -442,4 +443,4 @@ export class AttachmentCreateComponent implements OnInit {
 
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/frontend/plugins/onlyoffice-api-js/onlyoffice-viewer.component.ts b/src/frontend/plugins/onlyoffice-api-js/onlyoffice-viewer.component.ts
index 8c7fc29920d9d8a99fecac59be041ce2f4ddbad3..164767da4dc6ef4558b8c65c2a45e84087662c98 100644
--- a/src/frontend/plugins/onlyoffice-api-js/onlyoffice-viewer.component.ts
+++ b/src/frontend/plugins/onlyoffice-api-js/onlyoffice-viewer.component.ts
@@ -5,12 +5,11 @@ import {
     Input,
     EventEmitter,
     Output,
-    HostListener,
-    ViewChild
+    HostListener
 } from '@angular/core';
 import './onlyoffice-api.js';
 import { HttpClient } from '@angular/common/http';
-import { Subject, Observable, of } from 'rxjs';
+import { Subject, of } from 'rxjs';
 import { catchError, tap, filter } from 'rxjs/operators';
 import { LANG } from '../../app/translate.component';
 import { ConfirmComponent } from '../modal/confirm.component';
@@ -119,7 +118,6 @@ export class EcplOnlyofficeViewerComponent implements OnInit, AfterViewInit {
                 this.isSaving = false;
                 this.triggerAfterUpdatedDoc.emit();
                 this.eventAction.next(this.file);
-                this.eventAction.complete();
             })
         ).subscribe();
     }