diff --git a/pwnagotchi/plugins/default/gdrivesync.py b/pwnagotchi/plugins/default/gdrivesync.py
index 50d7433b..930840b6 100644
--- a/pwnagotchi/plugins/default/gdrivesync.py
+++ b/pwnagotchi/plugins/default/gdrivesync.py
@@ -111,14 +111,11 @@ class GdriveSync(plugins.Plugin):
             self.ready = False
 
     def get_folder_id_by_name(self, drive, folder_name):
-        query = f"'{folder_name}' in title and mimeType='application/vnd.google-apps.folder' and trashed=false"
-        file_list = drive.ListFile({'q': query}).GetList()
-        print(f"Query: {query}")
-        for file in file_list:
-            print(f"File Title: {file['title']}, Expected Folder Name: {folder_name}")
-            if file['title'] == folder_name:
-                return file['id']
-        return None
+        try:
+            folder = drive.ListFile({'q': f"title='{folder_name}' and mimeType='application/vnd.google-apps.folder' and trashed=false"}).GetList()[0]
+            return folder['id']
+        except IndexError:
+            return None
 
     def on_unload(self, ui):
         logging.info("[gdrivesync] unloaded")