diff --git a/dotCMS/src/main/java/com/dotmarketing/factories/InodeFactory.java b/dotCMS/src/main/java/com/dotmarketing/factories/InodeFactory.java
index 946c92c2fef0..57653f1fe724 100644
--- a/dotCMS/src/main/java/com/dotmarketing/factories/InodeFactory.java
+++ b/dotCMS/src/main/java/com/dotmarketing/factories/InodeFactory.java
@@ -58,6 +58,9 @@ public static java.util.List getChildrenClassByConditionAndOrderBy(String p, Cla
 		if(c.equals(Category.class)){
 			throw new DotStateException("Category mapping was deleted from hibernate files");
 		}
+		if(c.equals(Folder.class)){
+			throw new DotStateException("Folder mapping was deleted from hibernate files");
+		}
 
 		try {
 			final String tableName = c.newInstance().getType();
@@ -139,9 +142,11 @@ public static Inode getInode(String x, Class c) {
 			throw new DotStateException("Relationship mapping was deleted from hibernate files");
 		}
 		if(c.equals(Template.class)){
-			throw new DotStateException("Relationship mapping was deleted from hibernate files");
+			throw new DotStateException("Template mapping was deleted from hibernate files");
+		}
+		if(c.equals(Folder.class)) {
+			throw new DotStateException("Folder mapping was deleted from hibernate files");
 		}
-		
 		
 		
 		Inode inode = null;
diff --git a/dotCMS/src/main/java/com/dotmarketing/util/InodeUtils.java b/dotCMS/src/main/java/com/dotmarketing/util/InodeUtils.java
index 17d76c51eb13..eb1797a218af 100644
--- a/dotCMS/src/main/java/com/dotmarketing/util/InodeUtils.java
+++ b/dotCMS/src/main/java/com/dotmarketing/util/InodeUtils.java
@@ -195,7 +195,10 @@ public static Inode getInode(final String inode) throws DotDataException, DotSec
                 //Transform the found content type to a Structure
                 inodeObj = new StructureTransformer(foundContentType).asStructure();
             }
-        } else {
+		}else if ( shortOpt.isPresent() && ShortType.FOLDER == shortOpt.get().subType ) {
+			//Folder no longer inherit from inode, returning an empty inode
+			inodeObj = new Inode();
+		} else {
             inodeObj = InodeFactory.getInode(inode, Inode.class);
         }
         return inodeObj;
diff --git a/hotfix_tracking.md b/hotfix_tracking.md
index 6dbced3d5b3c..baa806e98b28 100644
--- a/hotfix_tracking.md
+++ b/hotfix_tracking.md
@@ -190,3 +190,4 @@ This maintenance release includes the following code fixes:
 154. https://github.com/dotCMS/core/issues/26439 : Relationship fields not respecting the order identifiers are sent via the workflow API #26439
 155. https://github.com/dotCMS/core/issues/25233 : sysPublishDate no longer appears to be part of the ElasticSearch object we create for indexing #25233
 156. https://github.com/dotCMS/core/issues/26706 : Change Default PUBSUB Provider #26706
+157. https://github.com/dotCMS/core/issues/26693 : Edit Permissions Individually stuck when editing folder with legacy ID #26693