diff --git a/pom.xml b/pom.xml
index ecaccf5..11d03b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.bwssystems.HABridge</groupId>
 	<artifactId>ha-bridge</artifactId>
-	<version>5.2.0RC24</version>
+	<version>5.2.0RC25</version>
 	<packaging>jar</packaging>
 
 	<name>HA Bridge</name>
@@ -129,7 +129,7 @@
 		<dependency>
 		    <groupId>com.github.bwssytems</groupId>
 		    <artifactId>broadlink-java-api</artifactId>
-		    <version>7d1c637f09</version>
+		    <version>cbed334fa1</version>
 		</dependency>
 		<dependency>
 		  <groupId>org.apache.commons</groupId>
diff --git a/src/main/java/com/bwssystems/HABridge/plugins/broadlink/BroadlinkHome.java b/src/main/java/com/bwssystems/HABridge/plugins/broadlink/BroadlinkHome.java
index a1412fa..212443a 100644
--- a/src/main/java/com/bwssystems/HABridge/plugins/broadlink/BroadlinkHome.java
+++ b/src/main/java/com/bwssystems/HABridge/plugins/broadlink/BroadlinkHome.java
@@ -67,10 +67,10 @@ public class BroadlinkHome implements Home {
 
 	@Override
 	public Object getItems(String type) {
-		if(!validBroadlink || broadlinkMap == null)
-			return null;
-		BroadlinkEntry theResponse = null;
 		List<BroadlinkEntry> deviceList = new ArrayList<BroadlinkEntry>();
+		if(!validBroadlink || broadlinkMap == null)
+			return deviceList;
+		BroadlinkEntry theResponse = null;
 		log.debug("consolidating devices for Broadlink");
 		Iterator<String> keys = broadlinkMap.keySet().iterator();
 		while(keys.hasNext()) {
diff --git a/src/main/resources/public/scripts/app.js b/src/main/resources/public/scripts/app.js
index f4ddbff..ed467f5 100644
--- a/src/main/resources/public/scripts/app.js
+++ b/src/main/resources/public/scripts/app.js
@@ -4097,7 +4097,7 @@ app.controller('BroadlinkController', function ($scope, $location, bridgeService
 
 	$scope.buildDeviceUrls = function (broadlinkdevice, dim_control, ondata, dimdata, offdata, colordata, buildonly) {
 		var preCmd = "{\"id\":\"" + broadlinkdevice.id + "\",\"name\":\"" + broadlinkdevice.name + "\",\"type\":\"" + broadlinkdevice.type + "\",\"ipAddr\":\"" + broadlinkdevice.ipAddr + "\",\"macAddr\":\"" + broadlinkdevice.macAddr + "\",\"command\":\"";
-		if(broadlinkdevice.baseType === '0000' || broadlinkdevice.type === '2711') {
+		if(broadlinkdevice.baseType === '0000' || broadlinkdevice.baseType === '2711') {
 			dimpayload = null;
 			colorpayload = null;
 			onpayload = preCmd + "on\"}";