diff --git a/package.json b/package.json
index 8fd87c6..dee8c77 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "tplink-adapter",
   "display_name": "TP-Link",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "TP-Link smart plug/bulb adapter plugin for Mozilla IoT Gateway",
   "author": "Mozilla IoT",
   "main": "main.py",
diff --git a/pkg/tplink_device.py b/pkg/tplink_device.py
index 1086c6e..ef4574f 100644
--- a/pkg/tplink_device.py
+++ b/pkg/tplink_device.py
@@ -111,6 +111,10 @@ def __init__(self, adapter, _id, hs100_dev, index=-1):
         has_emeter = False
         sysinfo = hs100_dev.sys_info
 
+        if 'dev_name' not in sysinfo or \
+                'Light Switch' not in sysinfo['dev_name']:
+            self._type.append('SmartPlug')
+
         if self.has_emeter(sysinfo):
             # emeter comes via a separate API call, so use it.
             emeter = hs100_dev.get_emeter_realtime()
@@ -118,7 +122,7 @@ def __init__(self, adapter, _id, hs100_dev, index=-1):
             power = self.power(emeter)
             if power is not None:
                 has_emeter = True
-                self._type.extend(['EnergyMonitor', 'SmartPlug'])
+                self._type.append('EnergyMonitor')
 
                 self.properties['instantaneousPower'] = TPLinkPlugProperty(
                     self,