diff --git a/src/Squidex/app/features/assets/pages/assets-page.component.ts b/src/Squidex/app/features/assets/pages/assets-page.component.ts
index dbab6b358..b2971b602 100644
--- a/src/Squidex/app/features/assets/pages/assets-page.component.ts
+++ b/src/Squidex/app/features/assets/pages/assets-page.component.ts
@@ -44,13 +44,13 @@ export class AssetsPageComponent extends ResourceOwner implements OnInit {
     }
 
     public ngOnInit() {
-        this.assetsState.load();
-
         this.own(
             this.assetsState.assetsQuery
                 .subscribe(query => {
                     this.filter.setQuery(query);
                 }));
+
+        this.assetsState.load();
     }
 
     public reload() {
diff --git a/src/Squidex/app/framework/state.ts b/src/Squidex/app/framework/state.ts
index 32da0e089..a0af32cdb 100644
--- a/src/Squidex/app/framework/state.ts
+++ b/src/Squidex/app/framework/state.ts
@@ -171,7 +171,7 @@ export class State<T extends {}> {
     }
 
     public resetState() {
-        this.next(this.initialState);
+        this.state.next(this.initialState);
     }
 
     public next(update: ((v: T) => Readonly<T>) | object) {
diff --git a/src/Squidex/app/shared/components/assets-selector.component.ts b/src/Squidex/app/shared/components/assets-selector.component.ts
index 4956ffd64..a5b08145e 100644
--- a/src/Squidex/app/shared/components/assets-selector.component.ts
+++ b/src/Squidex/app/shared/components/assets-selector.component.ts
@@ -50,6 +50,12 @@ export class AssetsSelectorComponent extends StatefulComponent<State> implements
     }
 
     public ngOnInit() {
+        this.own(
+            this.assetsState.assetsQuery
+                .subscribe(query => {
+                    this.filter.setQuery(query);
+                }));
+
         this.assetsState.load();
     }