diff --git a/setup.py b/setup.py
index 5289b11d1ed3073f8153c68c258db0ed4ad8d81d..1148ad4a2feed434b786e956106cc403de1bb3b6 100644
--- a/setup.py
+++ b/setup.py
@@ -37,7 +37,9 @@ def setup_jitsi():
     data = f.read()
     f.close()
     data = data.replace('#PUBLIC_URL=https://meet.example.com:8443', 'PUBLIC_URL=https://' + jitsi_subdomain + '.' + DOMAIN)
-    
+    if use_etherpad:
+       data = data.replace('#ETHERPAD_URL_BASE=http://etherpad.meet.jitsi:9001', 'ETHERPAD_URL_BASE=http://etherpad:9001')
+
     f = open('.env', 'w')
     f.write(data)
     f.close()
@@ -54,20 +56,9 @@ def setup_jitsi():
     f.close()
     os.system('cp jitsi-auto-config/jitsi.subdomain.conf reverse_proxy/nginx/proxy-confs/'+ jitsi_subdomain + '.subdomain.conf')
 
-def setup_etherpad():
-    f = open('.env', 'rt')
-    data = f.read()
-    f.close()
-    data.replace('#ETHERPAD_URL_BASE=http://etherpad.meet.jitsi:9001', 'ETHERPAD_URL_BASE=http://etherpad:9001')
-    f = open('.env', 'w')
-    f.write(data)
-    f.close()
-
 if __name__ == '__main__':
     configure_swag()
 
     if use_jitsi:
         setup_jitsi()
-    
-    if use_etherpad:
-        setup_etherpad()
+