diff --git a/modules/distribution/src/repository/jaggeryapps/iot/units/alldevices/alldevices.hbs b/modules/distribution/src/repository/jaggeryapps/iot/units/alldevices/alldevices.hbs
index 8e3cdc7d..eec368e3 100644
--- a/modules/distribution/src/repository/jaggeryapps/iot/units/alldevices/alldevices.hbs
+++ b/modules/distribution/src/repository/jaggeryapps/iot/units/alldevices/alldevices.hbs
@@ -20,6 +20,7 @@
                 </thead>
                 <tbody>
                 <form method="GET" action="{{myDevicePath}}">
+				{{#if devices.device}}
 				{{#each devices.device}}
 				<tr class="border-top">
 					<th scope="row">{{deviceIdentifier}}</th>
@@ -38,6 +39,14 @@
 					</td>
 				</tr>
 				{{/each}}
+				{{else}}
+				<tr class="border-top">
+					<th scope="row"></th>
+					<td colspan="2">
+						No Devices available.
+					</td>
+				</tr>
+				{{/if}}
                 </form>
                 </tbody>
             </table>