diff --git a/ui/src/buckets/components/BucketCard.tsx b/ui/src/buckets/components/BucketCard.tsx
index 3921ce89f3..0334bfe77a 100644
--- a/ui/src/buckets/components/BucketCard.tsx
+++ b/ui/src/buckets/components/BucketCard.tsx
@@ -61,25 +61,38 @@ class BucketRow extends PureComponent<Props & WithRouterProps> {
             onAddLineProtocol={this.handleAddLineProtocol}
             onAddScraper={this.handleAddScraper}
           />
-          <Button
-            text="Rename"
-            testID="bucket-rename"
-            size={ComponentSize.ExtraSmall}
-            onClick={this.handleRenameBucket}
-          />
-          <FeatureFlag name="deleteWithPredicate">
-            <Button
-              text="Delete Data By Filter"
-              testID="bucket-delete-task"
-              size={ComponentSize.ExtraSmall}
-              onClick={this.handleDeleteData}
-            />
-          </FeatureFlag>
+          {this.renameDeleteButtons}
         </FlexBox>
       </ResourceCard>
     )
   }
 
+  private renameDeleteButtons() {
+    const {bucket} = this.props
+    {
+      if (bucket.type === 'user') {
+        return (
+          <>
+            <Button
+              text="Rename"
+              testID="bucket-rename"
+              size={ComponentSize.ExtraSmall}
+              onClick={this.handleRenameBucket}
+            />
+            <FeatureFlag name="deleteWithPredicate">
+              <Button
+                text="Delete Data By Filter"
+                testID="bucket-delete-task"
+                size={ComponentSize.ExtraSmall}
+                onClick={this.handleDeleteData}
+              />
+            </FeatureFlag>
+          </>
+        )
+      } else return <></>
+    }
+  }
+
   private handleDeleteData = () => {
     const {onDeleteData, bucket} = this.props
 
diff --git a/ui/src/cloud/actions/limits.ts b/ui/src/cloud/actions/limits.ts
index f7848d55e1..3cfd2051e6 100644
--- a/ui/src/cloud/actions/limits.ts
+++ b/ui/src/cloud/actions/limits.ts
@@ -292,7 +292,10 @@ export const checkBucketLimits = () => async (
     } = getState()
 
     const bucketsMax = extractBucketMax(limits)
-    const bucketsCount = list.length
+    const buckets = list.filter(function(bucket) {
+      return bucket.type == 'user'
+    })
+    const bucketsCount = buckets.length
 
     if (bucketsCount >= bucketsMax) {
       dispatch(setBucketLimitStatus(LimitStatus.EXCEEDED))