diff --git a/ghost/admin/app/components/gh-infinity-loader.js b/ghost/admin/app/components/gh-infinity-loader.js
index fc0dd2ac93..1a3961c50c 100644
--- a/ghost/admin/app/components/gh-infinity-loader.js
+++ b/ghost/admin/app/components/gh-infinity-loader.js
@@ -1,5 +1,5 @@
 import InfinityLoader from 'ember-infinity/components/infinity-loader';
-import layout from '../templates/components/infinity-loader';
+import layout from '../templates/components/gh-infinity-loader';
 
 export default InfinityLoader.extend({
     layout
diff --git a/ghost/admin/app/components/infinity-loader.js b/ghost/admin/app/components/infinity-loader.js
deleted file mode 100644
index 1a3961c50c..0000000000
--- a/ghost/admin/app/components/infinity-loader.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import InfinityLoader from 'ember-infinity/components/infinity-loader';
-import layout from '../templates/components/gh-infinity-loader';
-
-export default InfinityLoader.extend({
-    layout
-});
diff --git a/ghost/admin/app/templates/components/gh-infinity-loader.hbs b/ghost/admin/app/templates/components/gh-infinity-loader.hbs
index 5a12515324..16c75a452a 100644
--- a/ghost/admin/app/templates/components/gh-infinity-loader.hbs
+++ b/ghost/admin/app/templates/components/gh-infinity-loader.hbs
@@ -1,8 +1,17 @@
-{{#if hasBlock}}
-    {{yield this.infinityModelContent}}
-{{else}}
-    {{#if this.isDoneLoading}}
-    {{else}}
-        <div class="gh-loading-spinner"></div>
-    {{/if}}
+{{#if this.isVisible}}
+    <div
+        {{did-insert this.didInsertLoader this}}
+        {{will-destroy this.willDestroyLoader this}}
+        class="{{this.loaderClassNames}}{{if this.viewportEntered " in-viewport"}}{{if this.isDoneLoading " reached-infinity"}}"
+        data-test-infinity-loader>
+
+        {{#if hasBlock}}
+            {{yield this.infinityModelContent}}
+        {{else}}
+            {{#if this.isDoneLoading}}
+            {{else}}
+                <div class="gh-loading-spinner"></div>
+            {{/if}}
+        {{/if}}
+    </div>
 {{/if}}
\ No newline at end of file
diff --git a/ghost/admin/config/deprecation-workflow.js b/ghost/admin/config/deprecation-workflow.js
index 94972917a8..cb6fee55f8 100644
--- a/ghost/admin/config/deprecation-workflow.js
+++ b/ghost/admin/config/deprecation-workflow.js
@@ -6,10 +6,6 @@ self.deprecationWorkflow.config = {
         {handler: 'silence', matchId: 'ember-component.send-action'},
 
         // remove once liquid-fire and liquid-wormhole remove uses of `this.$()`
-        {handler: 'silence', matchId: 'ember-views.curly-components.jquery-element'},
-
-        // remove once ember-infinity removes usage of `isVisible`
-        // https://github.com/ember-infinity/ember-infinity/pull/399
-        {handler: 'silence', matchId: 'ember-component.is-visible'}
+        {handler: 'silence', matchId: 'ember-views.curly-components.jquery-element'}
     ]
 };
diff --git a/ghost/admin/package.json b/ghost/admin/package.json
index 0248e02570..168ba9ff58 100644
--- a/ghost/admin/package.json
+++ b/ghost/admin/package.json
@@ -80,7 +80,7 @@
     "ember-export-application-global": "2.0.1",
     "ember-fetch": "8.0.1",
     "ember-in-viewport": "3.5.8",
-    "ember-infinity": "2.0.3",
+    "ember-infinity": "2.1.1",
     "ember-load": "0.0.17",
     "ember-load-initializers": "2.1.1",
     "ember-mocha": "0.16.2",
diff --git a/ghost/admin/yarn.lock b/ghost/admin/yarn.lock
index 21aeb4202e..3612363122 100644
--- a/ghost/admin/yarn.lock
+++ b/ghost/admin/yarn.lock
@@ -5993,7 +5993,7 @@ ember-get-config@, ember-get-config@^0.2.2:
     ember-cli-version-checker "^2.1.0"
     ember-factory-for-polyfill "^1.3.1"
 
-ember-in-viewport@3.5.8, ember-in-viewport@~3.0.0, ember-in-viewport@~3.7.1:
+ember-in-viewport@3.5.8, ember-in-viewport@~3.0.0, ember-in-viewport@~3.7.2:
   version "3.5.8"
   resolved "https://registry.yarnpkg.com/ember-in-viewport/-/ember-in-viewport-3.5.8.tgz#da03f5e69c5e5e6cbd048f0db8de0b05c2e3e68f"
   integrity sha512-2GBK5KbNYiGADy433tN3yHnxZ77wSnVyMezx23cr3qs2gwac+5ta2FkOTiKibNkGmWE/Mk/c7zcF7sDk1jy5DA==
@@ -6003,13 +6003,15 @@ ember-in-viewport@3.5.8, ember-in-viewport@~3.0.0, ember-in-viewport@~3.7.1:
     intersection-observer-admin "~0.2.5"
     raf-pool "0.1.0"
 
-ember-infinity@2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/ember-infinity/-/ember-infinity-2.0.3.tgz#bbe4bbc7fc441a681b270652b5f82d1a31ff3216"
-  integrity sha512-AzpZg3p1G1FtT2u5W7NTOXZRli8pKiqYl6VUqdB6hsWNoA16nEOPVQr4BW149bGZT7M/5XlTQofWsz0KkxSy7w==
+ember-infinity@2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ember-infinity/-/ember-infinity-2.1.1.tgz#ef1e5f25099696ac254c179a79c815afb7d36b48"
+  integrity sha512-tJrSYqcZCT0quLeu+IoXy46TAMaFtTRPF0jgHgKfa9xP4NvHDqENwdLpMewlkS4vbs3SCkxo4yBtQw5JG9GuEw==
   dependencies:
+    "@ember/render-modifiers" "^1.0.2"
     ember-cli-babel "~7.11.0"
-    ember-in-viewport "~3.7.1"
+    ember-cli-htmlbars "^3.0.1"
+    ember-in-viewport "~3.7.2"
 
 "ember-inflector@^2.0.0 || ^3.0.0", ember-inflector@^3.0.1:
   version "3.0.1"