diff --git a/pom.xml b/pom.xml
index 41e7721..5025943 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.bwssystems.HABridge</groupId>
 	<artifactId>ha-bridge</artifactId>
-	<version>1.1.0c</version>
+	<version>1.1.0d</version>
 	<packaging>jar</packaging>
 
 	<name>HA Bridge</name>
diff --git a/src/main/java/com/bwssystems/HABridge/hue/HueMulator.java b/src/main/java/com/bwssystems/HABridge/hue/HueMulator.java
index dda0d15..3a46a45 100644
--- a/src/main/java/com/bwssystems/HABridge/hue/HueMulator.java
+++ b/src/main/java/com/bwssystems/HABridge/hue/HueMulator.java
@@ -84,24 +84,10 @@ public class HueMulator {
 	        log.debug("hue lights list requested: " + userId + " from " + request.ip());
 	        List<DeviceDescriptor> deviceList = repository.findAll();
 	        Map<String, DeviceResponse> deviceResponseMap = new HashMap<>();
-	        Integer lastCount = lastUserIdCount.get(userId);
-	        if(lastCount == null)
-	        {
-	        	lastCount = new Integer(0);
-	        	lastUserIdCount.put(userId, lastCount);
-	        }
-	        for (int i = 0; i < bridgeSettings.getUpnpResponseDevices(); i++) {
-	        	if(lastCount >= deviceList.size())
-	        	{
-	        		lastCount = 0;
-	        		break;
-	        	}
-	        	DeviceDescriptor device = deviceList.get(lastCount);
+	        for (DeviceDescriptor device : deviceList) {
                 DeviceResponse deviceResponse = DeviceResponse.createResponse(device.getName(), device.getId());
 	            deviceResponseMap.put(device.getId(), deviceResponse);
-	            lastCount++;
 	        }
-        	lastUserIdCount.replace(userId, lastCount);
 			response.type("application/json; charset=utf-8"); 
 	        response.status(HttpStatus.SC_OK);
 	        return deviceResponseMap;