diff --git a/GWMS.UI/Pages/GasStation.razor b/GWMS.UI/Pages/GasStation.razor
index 35dc4c5..4894b4f 100644
--- a/GWMS.UI/Pages/GasStation.razor
+++ b/GWMS.UI/Pages/GasStation.razor
@@ -77,10 +77,9 @@
                                 OnBarcodeReceived="LocalReceivedBarcodeText" />*@
 
                             /* ((e) => { BarCode = e; ShowScanBarcode = !ShowScanBarcode; }) */
-
                             <BarcodeReader ScanResult="(e) => ScanDoneHandler(e)"
                                            ShowScanBarcode="ShowScanBarcode"
-                                           Close="() => ShowScanBarcode=!ShowScanBarcode"
+                                           Close="() => ResetScanner()"
                                            ScanBtnTitle="Scan"
                                            ResetBtnTitle="Reset"
                                            CloseBtnTitle="Close"
diff --git a/GWMS.UI/Pages/GasStation.razor.cs b/GWMS.UI/Pages/GasStation.razor.cs
index c94dd61..0ba33ed 100644
--- a/GWMS.UI/Pages/GasStation.razor.cs
+++ b/GWMS.UI/Pages/GasStation.razor.cs
@@ -174,6 +174,7 @@ namespace GWMS.UI.Pages
 
         protected DateTime vetoScan = DateTime.Now;
 
+#if false
         private async Task LocalReceivedBarcodeText(BarcodeReceivedEventArgs args)
         {
             DateTime adesso = DateTime.Now;
@@ -191,10 +192,9 @@ namespace GWMS.UI.Pages
                     var result = ProcessBarcode(ordCode);
                 }
             }
-        }
+        } 
+#endif
 
-        //[Parameter]
-        //public EventCallback<string> ScanDone { get; set; }
 
         protected void ScanDoneHandler(string value)
         {
@@ -215,11 +215,10 @@ namespace GWMS.UI.Pages
 
         private bool ShowScanBarcode { get; set; } = false;
 
-        public string? BarCode { get; set; }
 
         private async Task ProcessBarcode(string Barcode)
         {
-            if (doProcess(Barcode))
+            if (OrderCode != Barcode)
             {
                 await InvokeAsync(() =>
                 {
@@ -310,6 +309,11 @@ namespace GWMS.UI.Pages
         protected void ResetData()
         {
         }
+        protected void ResetScanner()
+        {
+            SelPlantId = 0;
+            forceReset();
+        }
 
         protected void ToggleBCode()
         {