diff --git a/server/conf.json b/server/conf.json
index 6341596d..c8861cd1 100644
--- a/server/conf.json
+++ b/server/conf.json
@@ -1,12 +1,12 @@
 {
-    "tts_path":"/media/erogol/data_ssd/Models/libri_tts/ljspeech-July-22-2019_10+45AM-ee706b5/",  // tts model root folder
+    "tts_path":"/media/erogol/data_ssd/Models/libri_tts/5049/",  // tts model root folder
     "tts_file":"best_model.pth.tar",     // tts checkpoint file
     "tts_config":"config.json",     // tts config.json file
     "tts_speakers": null,           // json file listing speaker ids. null if no speaker embedding.
-    "wavernn_lib_path": "/home/erogol/projects/",   // Rootpath to wavernn project folder to be imported. If this is null, model uses GL for speech synthesis.
-    "wavernn_path":"/media/erogol/data_ssd/Models/wavernn/universal/4910/",  // wavernn model root path
-    "wavernn_file":"best_model_16K.pth.tar", // wavernn checkpoint file name
-    "wavernn_config":"config_16K.json", // wavernn config file
+    "wavernn_lib_path": null,   // Rootpath to wavernn project folder to be imported. If this is null, model uses GL for speech synthesis.
+    "wavernn_path":null,  // wavernn model root path
+    "wavernn_file":null, // wavernn checkpoint file name
+    "wavernn_config": null, // wavernn config file
     "is_wavernn_batched":true, 
     "port": 5002,
     "use_cuda": true,
diff --git a/server/synthesizer.py b/server/synthesizer.py
index 414a15fe..3848968f 100644
--- a/server/synthesizer.py
+++ b/server/synthesizer.py
@@ -59,7 +59,7 @@ class Synthesizer(object):
             self.tts_model.cuda()
         self.tts_model.eval()
         self.tts_model.decoder.max_decoder_steps = 3000
-        if 'r' in cp:
+        if 'r' in cp and self.tts_config.model in ["Tacotron", "TacotronGST"]:
             self.tts_model.decoder.set_r(cp['r'])
 
     def load_wavernn(self, lib_path, model_path, model_file, model_config, use_cuda):