diff --git a/ghost/admin/app/services/tenor.js b/ghost/admin/app/services/tenor.js
index fb4405fbc2..c7bb25325f 100644
--- a/ghost/admin/app/services/tenor.js
+++ b/ghost/admin/app/services/tenor.js
@@ -6,8 +6,8 @@ import {isEmpty} from '@ember/utils';
 import {task, taskGroup, timeout} from 'ember-concurrency';
 import {tracked} from '@glimmer/tracking';
 
-const API_URL = 'https://g1.tenor.com';
-const API_VERSION = 'v1';
+const API_URL = 'https://tenor.googleapis.com';
+const API_VERSION = 'v2';
 const DEBOUNCE_MS = 600;
 
 export default class TenorService extends Service {
@@ -16,15 +16,17 @@ export default class TenorService extends Service {
     @tracked columnCount = 4;
     @tracked columns = null;
     @tracked error = null;
+    @tracked htmlError = null;
     @tracked gifs = new TrackedArray([]);
     @tracked searchTerm = '';
-    @tracked loadedType = 'trending';
+    @tracked loadedType = '';
 
     _columnHeights = [];
     _nextPos = null;
 
     get apiKey() {
-        return this.config.get('tenor.publicReadOnlyApiKey');
+        // @TODO confirm this!
+        return this.config.get('tenor.apiKey');
     }
 
     get contentfilter() {
@@ -94,9 +96,10 @@ export default class TenorService extends Service {
 
     @task({group: 'loadingTasks'})
     *loadTrendingTask() {
-        this.loadedType = 'trending';
+        this.loadedType = 'featured';
 
         yield this._makeRequest(this.loadedType, {params: {
+            q: 'excited',
             media_filter: 'minimal'
         }});
     }
@@ -134,6 +137,7 @@ export default class TenorService extends Service {
 
         const params = new URLSearchParams(options.params);
         params.set('key', this.apiKey);
+        params.set('client_key', 'ghost-editor');
         params.set('contentfilter', this.contentfilter);
 
         url.search = params.toString();
@@ -153,6 +157,12 @@ export default class TenorService extends Service {
                 if (!options.ignoreErrors && !this.error) {
                     this.error = 'Uh-oh! Trouble reaching the Tenor API, please check your connection';
                 }
+
+                if (this.error && this.error.startsWith('API key not valid')) {
+                    // Added an html error field, so that we don't pass raw API errors from tenor to triple-braces in the frontend
+                    this.htmlError = `This version of the Tenor API is no longer supported. Please update your API key by following our
+<a href="https://ghost.org/docs/config/#tenor" target="_blank" rel="noopener noreferrer"> documentation here</a>.<br />`;
+                }
                 console.error(e); // eslint-disable-line
             });
     }
@@ -165,8 +175,8 @@ export default class TenorService extends Service {
 
         let responseText;
 
-        if (response.headers.map['content-type'] === 'application/json') {
-            responseText = await response.json().then(json => json.errors[0]);
+        if (response.headers.map['content-type'].startsWith('application/json')) {
+            responseText = await response.json().then(json => json.error.message || json.error);
         } else if (response.headers.map['content-type'] === 'text/xml') {
             responseText = await response.text();
         }
@@ -192,7 +202,7 @@ export default class TenorService extends Service {
 
     _addGif(gif) {
         // re-calculate ratio for later use
-        const [width, height] = gif.media[0].tinygif.dims;
+        const [width, height] = gif.media_formats.tinygif.dims;
         gif.ratio = height / width;
 
         // add to general gifs list
diff --git a/ghost/admin/lib/koenig-editor/addon/components/koenig-card-image/selector-tenor.hbs b/ghost/admin/lib/koenig-editor/addon/components/koenig-card-image/selector-tenor.hbs
index d63f2c8e4b..00a323d56b 100644
--- a/ghost/admin/lib/koenig-editor/addon/components/koenig-card-image/selector-tenor.hbs
+++ b/ghost/admin/lib/koenig-editor/addon/components/koenig-card-image/selector-tenor.hbs
@@ -53,7 +53,9 @@
                 <section class="gh-unsplash-error h-100 flex items-center justify-center pb30">
                     <div>
                         <img class="gh-unsplash-error-404" src="assets/img/unsplash-404.png" alt="Network error" />
-                        <h4>{{this.tenor.error}} (<a href="#" {{on "click" this.tenor.retry}}>retry</a>)</h4>
+                        {{!-- template-lint-disable no-triple-curlies --}}
+                        <h4>{{#if this.tenor.htmlError}}{{{this.tenor.htmlError}}}{{else}}{{this.tenor.error}}{{/if}} (<a href="#" {{on "click" this.tenor.retry}}>retry</a>)</h4>
+                        {{!-- template-lint-enable no-triple-curlies --}}
                     </div>
                 </section>
             {{/if}}
diff --git a/ghost/admin/lib/koenig-editor/addon/components/koenig-card-image/selector-tenor.js b/ghost/admin/lib/koenig-editor/addon/components/koenig-card-image/selector-tenor.js
index 10e1ceae1b..220586d49b 100644
--- a/ghost/admin/lib/koenig-editor/addon/components/koenig-card-image/selector-tenor.js
+++ b/ghost/admin/lib/koenig-editor/addon/components/koenig-card-image/selector-tenor.js
@@ -58,7 +58,7 @@ export default class KoenigCardImageTenorSelector extends Component {
         event?.preventDefault();
         event?.stopPropagation();
 
-        const media = gif.media[0].gif;
+        const media = gif.media_formats.gif;
 
         const payload = {
             src: media.url,
diff --git a/ghost/admin/lib/koenig-editor/addon/components/koenig-card-image/selector-tenor/gif.js b/ghost/admin/lib/koenig-editor/addon/components/koenig-card-image/selector-tenor/gif.js
index 3947694a6d..328bee044c 100644
--- a/ghost/admin/lib/koenig-editor/addon/components/koenig-card-image/selector-tenor/gif.js
+++ b/ghost/admin/lib/koenig-editor/addon/components/koenig-card-image/selector-tenor/gif.js
@@ -3,7 +3,7 @@ import {htmlSafe} from '@ember/template';
 
 export default class GhTenorGifComponent extends Component {
     get media() {
-        return this.args.gif.media[0].tinygif;
+        return this.args.gif.media_formats.tinygif;
     }
 
     get imageUrl() {