diff --git a/daemon.py b/daemon.py
index 5d57c95a8..792a32b80 100644
--- a/daemon.py
+++ b/daemon.py
@@ -6316,9 +6316,12 @@ class PubServer(BaseHTTPRequestHandler):
                                     newYTDomain = newYTDomain.split('://')[1]
                                 if '/' in newYTDomain:
                                     newYTDomain = newYTDomain.split('/')[0]
-                                setConfigParam(self.server.baseDir,
-                                               'youtubedomain', newYTDomain)
-                                self.server.YTReplacementDomain = newYTDomain
+                                if '.' in newYTDomain:
+                                    setConfigParam(self.server.baseDir,
+                                                   'youtubedomain',
+                                                   newYTDomain)
+                                    self.server.YTReplacementDomain = \
+                                        newYTDomain
 
                         currInstanceDescriptionShort = \
                             getConfigParam(self.server.baseDir,
diff --git a/epicyon.py b/epicyon.py
index bd5ecf526..1ca654c63 100644
--- a/epicyon.py
+++ b/epicyon.py
@@ -1800,7 +1800,8 @@ if YTDomain:
         YTDomain = YTDomain.split('://')[1]
     if '/' in YTDomain:
         YTDomain = YTDomain.split('/')[0]
-    args.YTReplacementDomain = YTDomain
+    if '.' in YTDomain:
+        args.YTReplacementDomain = YTDomain
 
 if setTheme(baseDir, themeName):
     print('Theme set to ' + themeName)