diff --git a/core/server/api/canary/oembed.js b/core/server/api/canary/oembed.js
index 9f075ccddd..18c8ee8f0c 100644
--- a/core/server/api/canary/oembed.js
+++ b/core/server/api/canary/oembed.js
@@ -17,22 +17,7 @@ module.exports = {
         query({data}) {
             let {url, type} = data;
 
-            if (type === 'bookmark') {
-                return oembed.fetchBookmarkData(url)
-                    .catch(oembed.errorHandler(url));
-            }
-
-            return oembed.fetchOembedData(url).then((response) => {
-                if (!response && !type) {
-                    return oembed.fetchBookmarkData(url);
-                }
-                return response;
-            }).then((response) => {
-                if (!response) {
-                    return oembed.unknownProvider(url);
-                }
-                return response;
-            }).catch(oembed.errorHandler(url));
+            return oembed.fetchOembedDataFromUrl(url, type);
         }
     }
 };
diff --git a/core/server/api/v3/oembed.js b/core/server/api/v3/oembed.js
index 9f075ccddd..18c8ee8f0c 100644
--- a/core/server/api/v3/oembed.js
+++ b/core/server/api/v3/oembed.js
@@ -17,22 +17,7 @@ module.exports = {
         query({data}) {
             let {url, type} = data;
 
-            if (type === 'bookmark') {
-                return oembed.fetchBookmarkData(url)
-                    .catch(oembed.errorHandler(url));
-            }
-
-            return oembed.fetchOembedData(url).then((response) => {
-                if (!response && !type) {
-                    return oembed.fetchBookmarkData(url);
-                }
-                return response;
-            }).then((response) => {
-                if (!response) {
-                    return oembed.unknownProvider(url);
-                }
-                return response;
-            }).catch(oembed.errorHandler(url));
+            return oembed.fetchOembedDataFromUrl(url, type);
         }
     }
 };
diff --git a/core/server/services/oembed.js b/core/server/services/oembed.js
index 82be2b202a..2edeb24109 100644
--- a/core/server/services/oembed.js
+++ b/core/server/services/oembed.js
@@ -153,6 +153,12 @@ class OEmbed {
         }
     }
 
+    /**
+     * @param {string} _url
+     * @param {string} cardType
+     *
+     * @returns {Promise<Object>}
+     */
     fetchOembedData(_url, cardType) {
         // parse the url then validate the protocol and host to make sure it's
         // http(s) and not an IP address or localhost to avoid potential access to
@@ -253,6 +259,31 @@ class OEmbed {
             }
         });
     }
+
+    /**
+     * @param {string} url - oembed URL
+     * @param {string} type - card type
+     *
+     * @returns {Promise<Object>}
+     */
+    async fetchOembedDataFromUrl(url, type) {
+        if (type === 'bookmark') {
+            return this.fetchBookmarkData(url)
+                .catch(this.errorHandler(url));
+        }
+
+        return this.fetchOembedData(url).then((response) => {
+            if (!response && !type) {
+                return this.fetchBookmarkData(url);
+            }
+            return response;
+        }).then((response) => {
+            if (!response) {
+                return this.unknownProvider(url);
+            }
+            return response;
+        }).catch(this.errorHandler(url));
+    }
 }
 
 module.exports = OEmbed;