diff --git a/pkg/endpoints/utils.go b/pkg/endpoints/utils.go
index 4c704d86f..13d84bc2a 100644
--- a/pkg/endpoints/utils.go
+++ b/pkg/endpoints/utils.go
@@ -36,7 +36,13 @@ func HasDirectConnectivity(endpoint *portainer.Endpoint) bool {
 // IsNewerThan225 returns true if the agent version is newer than 2.25.0
 // this is used to check if the agent is compatible with the new diagnostics feature
 func IsNewerThan225(agentVersion string) bool {
-	v1, _ := version.NewVersion(agentVersion)
-	v2, _ := version.NewVersion("2.25.0")
+	v1, err := version.NewVersion(agentVersion)
+	if err != nil || v1 == nil {
+		return false
+	}
+	v2, err := version.NewVersion("2.25.0")
+	if err != nil || v2 == nil {
+		return false
+	}
 	return v1.GreaterThanOrEqual(v2)
 }
diff --git a/pkg/endpoints/utils_test.go b/pkg/endpoints/utils_test.go
index 4231cf60a..2e33107be 100644
--- a/pkg/endpoints/utils_test.go
+++ b/pkg/endpoints/utils_test.go
@@ -251,6 +251,11 @@ func TestIsNewerThan225(t *testing.T) {
 			version:  "2.24.0",
 			expected: false,
 		},
+		{
+			name:     "Not a version",
+			version:  "NotAVersion",
+			expected: false,
+		},
 	}
 
 	for _, tt := range tests {