diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c
index 935bdd8..ae150cc 100644
--- a/lib/metadata/lv_manip.c
+++ b/lib/metadata/lv_manip.c
@@ -3028,7 +3028,7 @@ again:
 			origin_active = info.exists;
 		}
 
-		if (!lv_is_multisnap_origin(org)) {
+		if (lp->voriginsize || !lv_is_multisnap_origin(org)) {
 			/*
 			 * If we are creating non-shared snapshot or
 			 * the shared snapshot store, create the underlying
@@ -3052,7 +3052,7 @@ again:
 		}
 	}
 
-	if (lp->snapshot && lv_is_multisnap_origin(org)) {
+	if (lp->snapshot && org && lv_is_multisnap_origin(org)) {
 		lp->extents = org->le_count;
 	}