diff --git a/lib/entity_widgets/controls/light_controls.dart b/lib/entity_widgets/controls/light_controls.dart
index fcd13cd..2e0bcdd 100644
--- a/lib/entity_widgets/controls/light_controls.dart
+++ b/lib/entity_widgets/controls/light_controls.dart
@@ -10,15 +10,15 @@ class LightControlsWidget extends StatefulWidget {
 class _LightControlsWidgetState extends State<LightControlsWidget> {
 
   int _tmpBrightness;
-  int _tmpColorTemp;
-  Color _tmpColor;
+  int _tmpColorTemp = 0;
+  Color _tmpColor = Colors.white;
   bool _changedHere = false;
   String _tmpEffect;
 
   void _resetState(LightEntity entity) {
     _tmpBrightness = entity.brightness ?? 0;
-    _tmpColorTemp = entity.colorTemp;
-    _tmpColor = entity.color;
+    _tmpColorTemp = entity.colorTemp ?? entity.minMireds?.toInt();
+    _tmpColor = entity.color ?? _tmpColor;
     _tmpEffect = null;
   }
 
@@ -119,7 +119,7 @@ class _LightControlsWidgetState extends State<LightControlsWidget> {
   }
 
   Widget _buildColorTempControl(LightEntity entity) {
-    if ((entity.supportColorTemp) && (_tmpColorTemp != null)) {
+    if (entity.supportColorTemp) {
       return UniversalSlider(
         title: "Color temperature",
         leading: Text("Cold", style: TextStyle(color: Colors.lightBlue),),
@@ -141,7 +141,7 @@ class _LightControlsWidgetState extends State<LightControlsWidget> {
   }
 
   Widget _buildColorControl(LightEntity entity) {
-    if ((entity.supportColor) && (entity.color != null)) {
+    if (entity.supportColor) {
       return Column(
         crossAxisAlignment: CrossAxisAlignment.center,
         children: <Widget>[
diff --git a/lib/main.dart b/lib/main.dart
index bd9b129..581d635 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -85,7 +85,7 @@ part 'ui_widgets/card_header_widget.dart';
 
 EventBus eventBus = new EventBus();
 const String appName = "HA Client";
-const appVersion = "0.3.13-81";
+const appVersion = "0.3.13-82";
 
 String homeAssistantWebHost;
 
diff --git a/pubspec.yaml b/pubspec.yaml
index 26cb7d9..808a4b1 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: hass_client
 description: Home Assistant Android Client
 
-version: 0.3.13+81
+version: 0.3.13+82
 
 environment:
   sdk: ">=2.0.0-dev.68.0 <3.0.0"