diff --git a/timesketch/api/v1/resources/contextlinks.py b/timesketch/api/v1/resources/contextlinks.py
index 2c3b8a82ba..7bf1a388a6 100644
--- a/timesketch/api/v1/resources/contextlinks.py
+++ b/timesketch/api/v1/resources/contextlinks.py
@@ -47,6 +47,12 @@ def get(self):
         if not context_link_yaml:
             return jsonify(response)
 
+        # Support for earlier version format of context links without hardcoded modules:
+        if not context_link_yaml.get("linked_services"):
+            context_link_yaml = {
+                "linked_services": context_link_yaml,
+            }
+
         if context_link_yaml.get("hardcoded_modules"):
             for entry in context_link_yaml.get("hardcoded_modules", []):
                 context_link_config = {
diff --git a/timesketch/frontend-ng/src/components/Explore/LinkRedirectWarning.vue b/timesketch/frontend-ng/src/components/Explore/LinkRedirectWarning.vue
index e3f88a3c82..454c80f115 100644
--- a/timesketch/frontend-ng/src/components/Explore/LinkRedirectWarning.vue
+++ b/timesketch/frontend-ng/src/components/Explore/LinkRedirectWarning.vue
@@ -28,13 +28,13 @@ limitations under the License.
         <div v-if="contextValue">
           <b>Value:</b><br/>
           <code class="code">
-            {{ contextValue }}
+            {{ getContextValue }}
           </code>
         </div>
         <div>
           <b>External website:</b><br/>
           <code class="code">
-            {{ contextUrl }}
+            {{ getContextUrl }}
           </code>
         </div>
 
@@ -62,6 +62,8 @@ limitations under the License.
   </template>
 
   <script>
+  import DOMPurify from 'dompurify';
+
   export default {
     props: ['contextValue', 'contextUrl' ],
     methods: {
@@ -69,6 +71,14 @@ limitations under the License.
         this.$emit('cancel')
       },
     },
+    computed: {
+      getContextValue() {
+        return DOMPurify.sanitize(this.contextValue)
+      },
+      getContextUrl() {
+        return DOMPurify.sanitize(this.contextUrl)
+      }
+    }
   }
   </script>