diff --git a/src/cards/ha-weather-card.js b/src/cards/ha-weather-card.js
index b497422085..aaa58babf9 100644
--- a/src/cards/ha-weather-card.js
+++ b/src/cards/ha-weather-card.js
@@ -128,7 +128,11 @@ class HaWeatherCard extends
             <div class="forecast">
               <template is="dom-repeat" items="[[forecast]]">
                 <div>
-                  <div class="weekday">[[computeDateTime(item.datetime)]]</div>
+                  <div class="weekday">[[computeDate(item.datetime)]]<br>
+                    <template is="dom-if" if="[[!item.templow]]">
+                      [[computeTime(item.datetime)]]
+                    </template>
+                  </div>
                   <template is="dom-if" if="[[item.condition]]">
                     <div class="icon">
                       <iron-icon icon="[[getWeatherIcon(item.condition)]]"></iron-icon>
@@ -237,16 +241,20 @@ class HaWeatherCard extends
     return typeof item !== 'undefined' && item !== null;
   }
 
-  computeDateTime(data) {
+  computeDate(data) {
     const date = new Date(data);
-    const provider = this.stateObj.attributes.attribution;
-    if (provider === 'Powered by Dark Sky' || provider === 'Data provided by OpenWeatherMap') {
-      return date.toLocaleTimeString(
-        this.hass.selectedLanguage || this.hass.language,
-        { hour: 'numeric' }
-      );
-    }
-    return date.toLocaleDateString(this.hass.selectedLanguage || this.hass.language, { weekday: 'short' });
+    return date.toLocaleDateString(
+      this.hass.selectedLanguage || this.hass.language,
+      { weekday: 'short' }
+    );
+  }
+
+  computeTime(data) {
+    const date = new Date(data);
+    return date.toLocaleTimeString(
+      this.hass.selectedLanguage || this.hass.language,
+      { hour: 'numeric' }
+    );
   }
 }
 customElements.define('ha-weather-card', HaWeatherCard);