diff --git a/frontend/src/components/ShootStatus.vue b/frontend/src/components/ShootStatus.vue
index 0e4229202..c49361fce 100644
--- a/frontend/src/components/ShootStatus.vue
+++ b/frontend/src/components/ShootStatus.vue
@@ -78,6 +78,10 @@ const errorCodes = {
   'ERR_INFRA_DEPENDENCIES': {
     shortDescription: 'Infrastructure Dependencies',
     description: 'Infrastructure operation failed as unmanaged resources exist in your cloud provider account. Please delete all manually created resources related to this Shoot.'
+  },
+  'ERR_CLEANUP_CLUSTER_RESOURCES': {
+    shortDescription: 'Cleanup Cluster',
+    description: 'Cleaning up the cluster failed as some resource are stuck in deletion. Please remove these resources properly or a forceful deletion will happen if this error persists.'
   }
 }
 
diff --git a/frontend/src/utils/index.js b/frontend/src/utils/index.js
index d68984631..f292393ed 100644
--- a/frontend/src/utils/index.js
+++ b/frontend/src/utils/index.js
@@ -381,7 +381,8 @@ export function isUserError (errorCodes) {
     'ERR_INFRA_UNAUTHORIZED',
     'ERR_INFRA_INSUFFICIENT_PRIVILEGES',
     'ERR_INFRA_QUOTA_EXCEEDED',
-    'ERR_INFRA_DEPENDENCIES'
+    'ERR_INFRA_DEPENDENCIES',
+    'ERR_CLEANUP_CLUSTER_RESOURCES'
   ]
   return every(errorCodes, errorCode => includes(userErrorCodes, errorCode))
 }