diff --git a/CHANGES.md b/CHANGES.md
index 697792af..f70c031f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,4 +1,9 @@
-### 0.12.17 (2017-05-15 22:10:00 UTC)
+### 0.12.18 (2017-05-15 23:00:00 UTC)
+
+* Change thexem, remove tvrage from xem
+
+
+### 0.12.17 (2017-05-15 22:10:00 UTC)
 
 * Remove provider ExtraTorrent
 * Change thexem tvrage mappings are deprecated, data fetch disabled
diff --git a/sickbeard/indexers/indexer_config.py b/sickbeard/indexers/indexer_config.py
index 5cec2ff1..38a3ea03 100644
--- a/sickbeard/indexers/indexer_config.py
+++ b/sickbeard/indexers/indexer_config.py
@@ -103,8 +103,6 @@ indexerConfig[info_src].update(dict(
               'showinfo.php?key=%(apikey)s&sid=' % indexerConfig[info_src]['api_params']),
     show_url='%sshows/id-' % indexerConfig[info_src]['main_url'],
     scene_url='https://sickgear.github.io/sg_tvrage_scene_exceptions/exceptions.txt',
-    # thexem tvrage mappings are deprecated, disable data fetch
-    # xem_origin='rage',
     defunct=True,
 ))
 
diff --git a/sickbeard/scene_exceptions.py b/sickbeard/scene_exceptions.py
index b3bb2cf4..38fcb2ad 100644
--- a/sickbeard/scene_exceptions.py
+++ b/sickbeard/scene_exceptions.py
@@ -289,7 +289,7 @@ def _xem_exceptions_fetcher():
             break
 
     if shouldRefresh(xem_list):
-        for indexer in sickbeard.indexerApi().indexers:
+        for indexer in [i for i in sickbeard.indexerApi().indexers if 'xem_origin' in sickbeard.indexerApi(i).config]:
             logger.log(u'Checking for XEM scene exception updates for %s' % sickbeard.indexerApi(indexer).name)
 
             url = 'http://thexem.de/map/allNames?origin=%s%s&seasonNumbers=1'\
diff --git a/sickbeard/scene_numbering.py b/sickbeard/scene_numbering.py
index c4719abd..1568246c 100644
--- a/sickbeard/scene_numbering.py
+++ b/sickbeard/scene_numbering.py
@@ -461,7 +461,7 @@ def xem_refresh(indexer_id, indexer, force=False):
     indexer_id = int(indexer_id)
     indexer = int(indexer)
 
-    if indexer_id not in xem_ids_list[indexer]:
+    if 'xem_origin' not in sickbeard.indexerApi(indexer).config or indexer_id not in xem_ids_list.get(indexer, []):
         return
 
     # XEM API URL