diff --git a/homeassistant/components/sensor/command_sensor.py b/homeassistant/components/sensor/command_sensor.py
index 1fd30a8bdb5..95751e73645 100644
--- a/homeassistant/components/sensor/command_sensor.py
+++ b/homeassistant/components/sensor/command_sensor.py
@@ -73,8 +73,11 @@ class CommandSensor(Entity):
         self.data.update()
         value = self.data.value
 
-        self._state = template.render_with_possible_json_value(
-            self._hass, self._value_template, value, 'N/A')
+        if self._value_template is not None:
+            self._state = template.render_with_possible_json_value(
+                self._hass, self._value_template, value, 'N/A')
+        else:
+            self._state = value
 
 
 # pylint: disable=too-few-public-methods