diff --git a/README.md b/README.md
index c0e9104..09d2632 100644
--- a/README.md
+++ b/README.md
@@ -71,7 +71,7 @@ This repository aims to promote the development of a multi-vendor management pla
 Run app using <u><b>Docker Compose</b></u>:
 <pre>
 user@user-laptop:~$ cd oktopus/deploy/compose
-user@user-laptop:~/oktopus/deploy/compose$ COMPOSE_PROFILES=nats,controller,mqtt,stomp,ws,adapter,frontend,portainer docker compose up -d
+user@user-laptop:~/oktopus/deploy/compose$ COMPOSE_PROFILES=nats,controller,cwmp,mqtt,stomp,ws,adapter,frontend,portainer docker compose up -d
 </pre>
 Oktopus deployment in <u><b>Kubernetes</b></u> still is in beta phase: <a href="https://github.com/OktopUSP/oktopus/blob/main/deploy/kubernetes/README.md"> Instructions for Kubernetes deployment</a><p></p>
         UI will open at port 3000:
diff --git a/deploy/compose/docker-compose.yaml b/deploy/compose/docker-compose.yaml
index 97a5f6c..559a094 100644
--- a/deploy/compose/docker-compose.yaml
+++ b/deploy/compose/docker-compose.yaml
@@ -186,6 +186,7 @@ services:
     networks:
       usp_network:
         ipv4_address: 172.16.235.16
+    profiles: [cwmp]
 
 networks:
    usp_network:
diff --git a/frontend/src/sections/overview/overview-latest-orders.js b/frontend/src/sections/overview/overview-latest-orders.js
index 7d4369f..6f85c03 100644
--- a/frontend/src/sections/overview/overview-latest-orders.js
+++ b/frontend/src/sections/overview/overview-latest-orders.js
@@ -97,18 +97,18 @@ export const OverviewLatestOrders = (props) => {
                     </SeverityPill>
                     </TableCell>
                     <TableCell>
-                    <SvgIcon 
-                      fontSize="small" 
-                      sx={{cursor: order.Status == 2 && 'pointer'}} 
-                      onClick={()=>{
-                          if (order.Status == 2){
-                            router.push("devices/"+order.SN+"/discovery")
+                      { order.Status == 2 && (order.Mqtt == 0 && order.Websockets == 0 && order.Stomp == 0) ? <span></span>: <SvgIcon 
+                        fontSize="small" 
+                        sx={{cursor: order.Status == 2 && 'pointer'}} 
+                        onClick={()=>{
+                            if (order.Status == 2){
+                              router.push("devices/"+order.SN+"/discovery")
+                            }
                           }
                         }
-                      }
-                    >
-                      <ArrowTopRightOnSquareIcon />
-                    </SvgIcon>
+                      >
+                        <ArrowTopRightOnSquareIcon />
+                      </SvgIcon>}
                     </TableCell>
                   </TableRow>
                 );