diff --git a/provider/resource_keycloak_openid_client_default_scopes.go b/provider/resource_keycloak_openid_client_default_scopes.go
index d2e73d4b..cf59628c 100644
--- a/provider/resource_keycloak_openid_client_default_scopes.go
+++ b/provider/resource_keycloak_openid_client_default_scopes.go
@@ -70,6 +70,8 @@ func resourceKeycloakOpenidClientDefaultScopesReconcile(ctx context.Context, dat
 
 	keycloakOpenidClientDefaultScopes, err := keycloakClient.GetOpenidClientDefaultScopes(ctx, realmId, clientId)
 	if err != nil {
+		if keycloak.ErrorIs404(err) {
+			return diag.FromErr(fmt.Errorf("validation error: client with id %s does not exist", clientId))
 		return diag.FromErr(err)
 	}
 
diff --git a/provider/resource_keycloak_openid_client_optional_scopes.go b/provider/resource_keycloak_openid_client_optional_scopes.go
index 85dfa7a5..c5341feb 100644
--- a/provider/resource_keycloak_openid_client_optional_scopes.go
+++ b/provider/resource_keycloak_openid_client_optional_scopes.go
@@ -70,6 +70,8 @@ func resourceKeycloakOpenidClientOptionalScopesReconcile(ctx context.Context, da
 
 	keycloakOpenidClientOptionalScopes, err := keycloakClient.GetOpenidClientOptionalScopes(ctx, realmId, clientId)
 	if err != nil {
+		if keycloak.ErrorIs404(err) {
+			return diag.FromErr(fmt.Errorf("validation error: client with id %s does not exist", clientId))
 		return diag.FromErr(err)
 	}