diff --git a/esphome/components/ota.py b/esphome/components/ota.py
index 61cb870c46..d1e522741d 100644
--- a/esphome/components/ota.py
+++ b/esphome/components/ota.py
@@ -51,7 +51,7 @@ REQUIRED_BUILD_FLAGS = '-DUSE_NEW_OTA'
 
 def lib_deps(config):
     if CORE.is_esp32:
-        return ['Update', 'ESPmDNS']
+        return ['Update']
     if CORE.is_esp8266:
-        return ['Hash', 'ESP8266mDNS']
+        return ['Hash']
     raise NotImplementedError
diff --git a/esphome/writer.py b/esphome/writer.py
index 319669f72a..381746dbc0 100644
--- a/esphome/writer.py
+++ b/esphome/writer.py
@@ -288,8 +288,10 @@ def gather_lib_deps():
         if CORE.arduino_version in (ARDUINO_VERSION_ESP32_DEV, ARDUINO_VERSION_ESP32_1_0_1):
             lib_deps.add('AsyncTCP@1.0.3')
             lib_deps.discard('AsyncTCP@1.0.1')
+        lib_deps.add('ESPmDNS')
     elif CORE.is_esp8266:
         lib_deps.add('ESPAsyncTCP@1.1.3')
+        lib_deps.add('ESP8266mDNS')
     # avoid changing build flags order
     lib_deps_l = list(lib_deps)
     lib_deps_l.sort()
@@ -393,7 +395,6 @@ def get_ini_content():
         data['lib_ldf_mode'] = 'chain'
         REMOVABLE_LIBRARIES = [
             'ArduinoOTA',
-            'ESPmDNS',
             'Update',
             'Wire',
             'FastLED',