diff --git a/core/modules/user/migration_templates/d6_user.yml b/core/modules/user/migration_templates/d6_user.yml
index 00dba32..7c61528 100644
--- a/core/modules/user/migration_templates/d6_user.yml
+++ b/core/modules/user/migration_templates/d6_user.yml
@@ -23,9 +23,13 @@ process:
     migration: d6_user_role
     source: roles
   user_picture:
-    plugin: migration
-    migration: d6_user_picture_file
-    source: uid
+    -
+      plugin: skip_on_empty
+      method: process
+    -
+      plugin: migration
+      migration: d6_user_picture_file
+      source: uid
 destination:
   plugin: entity:user
   md5_passwords: true
diff --git a/core/modules/user/migration_templates/d7_user.yml b/core/modules/user/migration_templates/d7_user.yml
index 6dbbde9..3b89bf6 100755
--- a/core/modules/user/migration_templates/d7_user.yml
+++ b/core/modules/user/migration_templates/d7_user.yml
@@ -25,9 +25,13 @@ process:
     migration: d7_user_role
     source: roles
   user_picture:
-    plugin: migration
-    migration: d7_file
-    source: picture
+    -
+      plugin: skip_on_empty
+      method: process
+    -
+      plugin: migration
+      migration: d7_file
+      source: picture
 destination:
   plugin: entity:user
 migration_dependencies: