diff --git a/server/internal/data/pod.go b/server/internal/data/pod.go
index 0062d11..591105a 100644
--- a/server/internal/data/pod.go
+++ b/server/internal/data/pod.go
@@ -120,8 +120,10 @@ func (r *podRepo) fetchContainerInfo(pod *corev1.Pod) []*biz.Container {
 		return containers
 	}
 
+	ctrIdMaps := map[string]string{}
 	containerStat := map[string]string{}
 	for _, ctr := range pod.Status.ContainerStatuses {
+		ctrIdMaps[ctr.Name] = ctr.ContainerID
 		containerStat[ctr.Name] = biz.ContainerStatusUnknown
 		if pod.Status.Phase == corev1.PodRunning && ctr.Ready {
 			containerStat[ctr.Name] = biz.ContainerStatusSuccess
@@ -129,10 +131,7 @@ func (r *podRepo) fetchContainerInfo(pod *corev1.Pod) []*biz.Container {
 			containerStat[ctr.Name] = biz.ContainerStatusFailed
 		}
 	}
-	ctrIdMaps := map[string]string{}
-	for _, ctr := range pod.Status.ContainerStatuses {
-		ctrIdMaps[ctr.Name] = ctr.ContainerID
-	}
+
 	for i, ctr := range pod.Spec.Containers {
 		c := &biz.Container{
 			Name:             ctr.Name,
diff --git a/server/internal/service/container.go b/server/internal/service/container.go
index 8e1da81..4bde7f2 100644
--- a/server/internal/service/container.go
+++ b/server/internal/service/container.go
@@ -69,6 +69,10 @@ func (s *ContainerService) GetAllContainers(ctx context.Context, req *pb.GetAllC
 				deviceID = device.Id
 			}
 
+			if deviceID == "" {
+				continue
+			}
+
 			if filters.DeviceId != "" && !strings.HasPrefix(deviceID, filters.DeviceId) {
 				continue
 			}