diff --git a/OrbitalBeat.go b/OrbitalBeat.go
index 4e18fe6..1f080bf 100644
--- a/OrbitalBeat.go
+++ b/OrbitalBeat.go
@@ -110,6 +110,8 @@ func handleQueryRequest(ctx *httputils.RequestContext, identifier cid.Cid, extra
 			origin = ctx.GetRequestHeader("Referer")
 		} else if len(ctx.GetRequestHeader("Origin")) > 0 {
 			origin = ctx.GetRequestHeader("Origin")
+		} else if len(extraArguments) > 1 {
+			origin = "https://" + extraArguments[1]
 		}
 
 		//Try to redirect back to origin