diff --git a/index.json b/index.json
index a48fc79..ee532ef 100644
--- a/index.json
+++ b/index.json
@@ -380,7 +380,7 @@
   },
   "toolbar": {
     "react": true,
-    "version": "0.7.0",
+    "version": "0.7.1",
     "style": true,
     "icon": false,
     "test": true,
diff --git a/src/share/Component.ts b/src/share/Component.ts
index 18decad..e4c3bd8 100644
--- a/src/share/Component.ts
+++ b/src/share/Component.ts
@@ -44,7 +44,7 @@ export default class Component<
     ])
 
     this.on('optionChange', (name, val) => {
-      if (name === 'theme') {
+      if (name === 'theme' && val) {
         let t = val
         if (val === 'auto') {
           t = theme.get()
diff --git a/src/toolbar/package.json b/src/toolbar/package.json
index c5fefb3..886516b 100644
--- a/src/toolbar/package.json
+++ b/src/toolbar/package.json
@@ -1,6 +1,6 @@
 {
   "name": "toolbar",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "description": "Application toolbar",
   "luna": {
     "react": true