diff --git a/ember-infinity/src/components/infinity-loader.hbs b/ember-infinity/src/components/infinity-loader.hbs
index 8a3b3b9a..af48500f 100644
--- a/ember-infinity/src/components/infinity-loader.hbs
+++ b/ember-infinity/src/components/infinity-loader.hbs
@@ -20,4 +20,6 @@
       {{/if}}
     {{/if}}
   </div>
+{{else}}
+  <div {{did-update this._initialInfinityModelSetup @infinityModel}}></div>
 {{/if}}
\ No newline at end of file
diff --git a/test-app/tests/integration/infinity-loader-test.js b/test-app/tests/integration/infinity-loader-test.js
index 4687720d..9b9ec066 100644
--- a/test-app/tests/integration/infinity-loader-test.js
+++ b/test-app/tests/integration/infinity-loader-test.js
@@ -66,6 +66,40 @@ module('infinity-loader', function (hooks) {
     assert.notOk(find('[data-test-infinity-loader]'), 'Element is not found');
   });
 
+  test('hideOnInfinity works when reached infinity and changing model', async function (assert) {
+    this.infinityModel = {
+      name: 'dot',
+      reachedInfinity: true,
+      on: () => {},
+      off: () => {},
+    };
+    await render(hbs`
+      <InfinityLoader
+        @infinityModel={{this.infinityModel}}
+        @hideOnInfinity={{true}}
+        @infinity={{this.infinityServiceMock}}
+      />
+    `);
+
+    assert.notOk(find('[data-test-infinity-loader]'), 'Loader is not shown');
+
+    run(() => {
+      set(this, 'infinityModel', {
+        name: 'dot2',
+        reachedInfinity: false,
+        on: () => {},
+        off: () => {},
+      });
+    });
+
+    await waitUntil(
+      () => {
+        return find('[data-test-infinity-loader]') != null;
+      },
+      { timeoutMessage: 'Loader is shown' },
+    );
+  });
+
   test('hideOnInfinity does not work if hideOnInfinity=false', async function (assert) {
     this.infinityModel = {
       name: 'dot',