diff --git a/app/assets/javascripts/components/Tags/RootTagDropZone.tsx b/app/assets/javascripts/components/Tags/RootTagDropZone.tsx
index 3e758536c..10dcf0dfa 100644
--- a/app/assets/javascripts/components/Tags/RootTagDropZone.tsx
+++ b/app/assets/javascripts/components/Tags/RootTagDropZone.tsx
@@ -18,7 +18,6 @@ export const RootTagDropZone: React.FC<Props> = observer(
   ({ tagsState, featuresState }) => {
     const premiumModal = usePremiumModal();
     const isNativeFoldersEnabled = featuresState.enableNativeFoldersFeature;
-    const hasFolders = featuresState.hasFolders;
 
     const [{ isOver, canDrop }, dropRef] = useDrop<DropItem, void, DropProps>(
       () => ({
@@ -27,11 +26,6 @@ export const RootTagDropZone: React.FC<Props> = observer(
           return true;
         },
         drop: (item) => {
-          if (!hasFolders) {
-            premiumModal.activate(TAG_FOLDERS_FEATURE_NAME);
-            return;
-          }
-
           tagsState.assignParent(item.uuid, undefined);
         },
         collect: (monitor) => ({
@@ -39,10 +33,10 @@ export const RootTagDropZone: React.FC<Props> = observer(
           canDrop: !!monitor.canDrop(),
         }),
       }),
-      [tagsState, hasFolders, premiumModal]
+      [tagsState, premiumModal]
     );
 
-    if (!isNativeFoldersEnabled || !hasFolders) {
+    if (!isNativeFoldersEnabled) {
       return null;
     }
 
diff --git a/app/assets/javascripts/components/Tags/TagsListItem.tsx b/app/assets/javascripts/components/Tags/TagsListItem.tsx
index ed16e34a0..0aacdd462 100644
--- a/app/assets/javascripts/components/Tags/TagsListItem.tsx
+++ b/app/assets/javascripts/components/Tags/TagsListItem.tsx
@@ -120,7 +120,7 @@ export const TagsListItem: FunctionComponent<Props> = observer(
           isDragging: !!monitor.isDragging(),
         }),
       }),
-      [tag, hasFolders]
+      [tag, isNativeFoldersEnabled]
     );
 
     const [{ isOver, canDrop }, dropRef] = useDrop<DropItem, void, DropProps>(
@@ -160,7 +160,7 @@ export const TagsListItem: FunctionComponent<Props> = observer(
         >
           {!tag.errorDecrypting ? (
             <div className="tag-info" title={title} ref={dropRef}>
-              {hasFolders && isNativeFoldersEnabled && hasAtLeastOneFolder && (
+              {isNativeFoldersEnabled && hasAtLeastOneFolder && (
                 <div
                   className={`tag-fold ${showChildren ? 'opened' : 'closed'}`}
                   onClick={hasChildren ? toggleChildren : undefined}
diff --git a/app/assets/javascripts/ui_models/app_state/tags_state.ts b/app/assets/javascripts/ui_models/app_state/tags_state.ts
index ed7fd4983..3e075c3e2 100644
--- a/app/assets/javascripts/ui_models/app_state/tags_state.ts
+++ b/app/assets/javascripts/ui_models/app_state/tags_state.ts
@@ -172,7 +172,7 @@ export class TagsState {
   }
 
   getChildren(tag: SNTag): SNTag[] {
-    if (!this.features.hasFolders) {
+    if (!this.features.enableNativeFoldersFeature) {
       return [];
     }
 
@@ -230,7 +230,7 @@ export class TagsState {
   }
 
   get rootTags(): SNTag[] {
-    if (!this.features.hasFolders) {
+    if (!this.features.enableNativeFoldersFeature) {
       return this.tags;
     }