diff --git a/backend/app/service/snapshot.go b/backend/app/service/snapshot.go
index 203267415..1b57a484d 100644
--- a/backend/app/service/snapshot.go
+++ b/backend/app/service/snapshot.go
@@ -337,13 +337,14 @@ func (u *SnapshotService) SnapshotRollback(req dto.SnapshotRecover) error {
 		defer func() {
 			global.Cron.Start()
 		}()
-		snapJson, err := u.readFromJson(fmt.Sprintf("%s/snapshot.json", rootDir))
-		if err != nil {
-			updateRollbackStatus(snap.ID, constant.StatusFailed, fmt.Sprintf("decompress file failed, err: %v", err))
+
+		u.OriginalPath = fmt.Sprintf("%s/1panel_original/original_%s", global.CONF.System.BaseDir, snap.Name)
+		if _, err := os.Stat(u.OriginalPath); err != nil && os.IsNotExist(err) {
 			return
 		}
-		u.OriginalPath = fmt.Sprintf("%s/1panel_original/original_%s", snapJson.OldBaseDir, snap.Name)
-		if _, err := os.Stat(u.OriginalPath); err != nil && os.IsNotExist(err) {
+		snapJson, err := u.readFromJson(fmt.Sprintf("%s/snapshot.json", u.OriginalPath))
+		if err != nil {
+			updateRollbackStatus(snap.ID, constant.StatusFailed, fmt.Sprintf("read snapjson file failed, err: %v", err))
 			return
 		}
 
diff --git a/frontend/src/views/container/image/prune/index.vue b/frontend/src/views/container/image/prune/index.vue
index 9fafbe13d..884e9ee2e 100644
--- a/frontend/src/views/container/image/prune/index.vue
+++ b/frontend/src/views/container/image/prune/index.vue
@@ -22,7 +22,7 @@
             </span>
             <div v-if="!withTagAll">
                 <ul v-for="(item, index) in unTagList" :key="index">
-                    <li v-if="item.tags">
+                    <li v-if="item.tags && item.tags[0]">
                         {{ item.tags[0] }}
                     </li>
                     <li v-else>
@@ -32,7 +32,7 @@
             </div>
             <div v-else>
                 <ul v-for="(item, index) in unUsedList" :key="index">
-                    <li v-if="item.tags">{{ item.tags.join(', ') }}</li>
+                    <li v-if="item.tags && item.tags[0]">{{ item.tags.join(', ') }}</li>
                     <li v-else>{{ item.id.replaceAll('sha256:', '').substring(0, 12) }}</li>
                 </ul>
             </div>