diff --git a/lib/sasa.c b/lib/sasa.c
index 19fe992..487f1de 100644
--- a/lib/sasa.c
+++ b/lib/sasa.c
@@ -34,7 +34,7 @@ int tanabata_sasa_rem_by_id(Tanabata *tanabata, uint64_t sasa_id) {
 }
 
 int tanabata_sasa_rem_by_path(Tanabata *tanabata, const char *path) {
-    if (path == NULL) {
+    if (tanabata->sasahyou.size == 0 || path == NULL) {
         return 1;
     }
     char *abspath = NULL;
diff --git a/lib/tanzaku.c b/lib/tanzaku.c
index 9cc803c..9df8e12 100644
--- a/lib/tanzaku.c
+++ b/lib/tanzaku.c
@@ -28,7 +28,7 @@ int tanabata_tanzaku_rem_by_id(Tanabata *tanabata, uint64_t tanzaku_id) {
 }
 
 int tanabata_tanzaku_rem_by_name(Tanabata *tanabata, const char *name) {
-    if (name == NULL) {
+    if (tanabata->sasahyou.size == 0 || name == NULL) {
         return 1;
     }
     Tanzaku *current_tanzaku = tanabata->sappyou.database + 1;