diff --git a/sycl/doc/conf.py b/sycl/doc/conf.py
index 12e2b81155d30..c976900bda320 100644
--- a/sycl/doc/conf.py
+++ b/sycl/doc/conf.py
@@ -15,6 +15,7 @@
 # sys.path.insert(0, os.path.abspath('.'))
 
 import datetime
+from docutils import nodes
 
 # -- Project information -----------------------------------------------------
 
@@ -51,11 +52,11 @@
 suppress_warnings = [ 'misc.highlighting_failure' ]
 
 def on_missing_reference(app, env, node, contnode):
-    if node['reftype'] == 'any':
-        contnode['refuri'] = "https://github.com/intel/llvm/tree/sycl/sycl/doc/" + node['reftarget']
-        return contnode
-    else:
-        return None
+    new_target = "https://github.com/intel/llvm/tree/sycl/sycl/doc/" + node['reftarget']
+
+    newnode = nodes.reference('', '', internal=False, refuri=new_target)
+    newnode.append(contnode)
+    return newnode
 
 def setup(app):
     app.connect('missing-reference', on_missing_reference)