diff --git a/src/3rd/js/aframe/index.js b/src/3rd/js/aframe/index.js
index c6770e4..8332af1 100644
--- a/src/3rd/js/aframe/index.js
+++ b/src/3rd/js/aframe/index.js
@@ -21,8 +21,11 @@ window.AFRAME.registerComponent('xrf', {
       let searchIsUri = document.location.search && 
                         !document.location.search.match(/=/) &&
                         document.location.search.match("/")
-      if( searchIsUri || document.location.hash.length > 1 ){ // override url
-        this.data = `${document.location.search.substr(1)}${document.location.hash}`
+      if( searchIsUri  ){ // override url
+        this.data = `${document.location.search.substr(1)}`
+      }
+      if( document.location.hash.length > 1 ){
+        this.data = this.data.replace(/#.*/,'') + document.location.hash
       }
     }