diff --git a/lib/pages/registration/parts/registration_scan_part.dart b/lib/pages/registration/parts/registration_scan_part.dart
index 7b0293c..dd057e9 100644
--- a/lib/pages/registration/parts/registration_scan_part.dart
+++ b/lib/pages/registration/parts/registration_scan_part.dart
@@ -60,8 +60,10 @@ extension _RegistrationScanPart on _RegistrationPageState {
   }
 
   void _handleLocationScan(String locationCode, CodeType locationType) {
-    // In singleCode mode or no existing data, switch directly
-    if (_mode == RegistrationMode.singleCode || _zongpaiNos.isEmpty) {
+    // In singleCode mode or no existing data or no previous shelf, switch directly
+    if (_mode == RegistrationMode.singleCode ||
+        _zongpaiNos.isEmpty ||
+        _locationCode == null) {
       _feedbackService.trigger(FeedbackEvent.scanValid);
       setState(() {
         _locationCode = locationCode;