diff --git a/homeassistant/components/influxdb.py b/homeassistant/components/influxdb.py
index ab8a2d76e94..123cf5bc0e3 100644
--- a/homeassistant/components/influxdb.py
+++ b/homeassistant/components/influxdb.py
@@ -85,7 +85,7 @@ def setup(hass, config):
 
         measurement = state.attributes.get('unit_of_measurement')
         if measurement in (None, ''):
-            measurement = '{}.{}'.format(state.domain, state.object_id)
+            measurement = state.entity_id
 
         json_body = [
             {