diff --git a/internal/cli/deployment_list.go b/internal/cli/deployment_list.go
index 44600653da8..fdb7b76864a 100644
--- a/internal/cli/deployment_list.go
+++ b/internal/cli/deployment_list.go
@@ -113,7 +113,7 @@ func (c *DeploymentListCommand) Run(args []string) int {
 			Workspace:   wsRef,
 		})
 
-		if status.Code(err) == codes.NotFound {
+		if status.Code(err) == codes.NotFound || status.Code(err) == codes.Unimplemented{
 			err = nil
 			statusReportsResp = nil
 		}
diff --git a/internal/server/gen/server.pb.go b/internal/server/gen/server.pb.go
index 60267a1a0f3..31d5713fe21 100644
--- a/internal/server/gen/server.pb.go
+++ b/internal/server/gen/server.pb.go
@@ -7409,11 +7409,14 @@ type StatusReport struct {
 	// StatusReport is the raw SDK report object encoded directly from the plugin.
 	// This message is a StatusReport proto that exists inside the SDK
 	StatusReport *anypb.Any `protobuf:"bytes,7,opt,name=status_report,json=statusReport,proto3" json:"status_report,omitempty"`
-	// The overall health of the deployment or release as reported by the plugin
+	// The overall health of the deployment or release as reported by the plugin.
+	// Copied from the plugin generated raw SDK status report for convenient API access.
 	Health *StatusReport_Health `protobuf:"bytes,8,opt,name=health,proto3" json:"health,omitempty"`
 	// A health report of all of the resources that make up the report.
+	// Copied from the plugin generated raw SDK status report for convenient API access.
 	ResourcesHealth []*StatusReport_Health `protobuf:"bytes,9,rep,name=resources_health,json=resourcesHealth,proto3" json:"resources_health,omitempty"`
 	// the time when this report was generated
+	// Copied from the plugin generated raw SDK status report for convenient API access.
 	GeneratedTime *timestamppb.Timestamp `protobuf:"bytes,10,opt,name=generated_time,json=generatedTime,proto3" json:"generated_time,omitempty"`
 }
 
diff --git a/internal/server/proto/server.proto b/internal/server/proto/server.proto
index f2a76662d85..d76ecdd3bba 100644
--- a/internal/server/proto/server.proto
+++ b/internal/server/proto/server.proto
@@ -2368,12 +2368,18 @@ message StatusReport {
   // This message is a StatusReport proto that exists inside the SDK
   google.protobuf.Any status_report = 7;
 
-  // The overall health of the deployment or release as reported by the plugin
+  // The overall health of the deployment or release as reported by the plugin.
+  // Copied from the plugin generated raw SDK status report for convenient API access.
   Health health = 8;
 
   // A health report of all of the resources that make up the report.
+  // Copied from the plugin generated raw SDK status report for convenient API access.
   repeated Health resources_health = 9;
 
+  // the time when this report was generated
+  // Copied from the plugin generated raw SDK status report for convenient API access.
+  google.protobuf.Timestamp generated_time = 10;
+
   message Health {
     // the overall health of the report for a resource
     string health_status = 1;
@@ -2387,9 +2393,6 @@ message StatusReport {
     // Resource id
     string id = 4;
   }
-
-  // the time when this report was generated
-  google.protobuf.Timestamp generated_time = 10;
 }
 
 /********************************************************************