diff --git a/core/partition.go b/core/partition.go
index 5db6e01e..f2f1ebc5 100644
--- a/core/partition.go
+++ b/core/partition.go
@@ -304,6 +304,11 @@ func (part *Partition) WaitUntilAvailable() {
 	for {
 		_, err := os.Stat(part.Path)
 		if !os.IsNotExist(err) {
+            // If Filesystem is not set, we're done
+            if part.Filesystem == "" {
+                return
+            }
+
 			if uuid, err := part.GetUUID(); err != nil && uuid != "" {
 				return
 			}