diff --git a/Main/src/main/java/com/chameleonvision/vision/process/VisionProcess.java b/Main/src/main/java/com/chameleonvision/vision/process/VisionProcess.java
index 20fe45b7f..feae97ead 100644
--- a/Main/src/main/java/com/chameleonvision/vision/process/VisionProcess.java
+++ b/Main/src/main/java/com/chameleonvision/vision/process/VisionProcess.java
@@ -87,11 +87,14 @@ public class VisionProcess implements Runnable {
 				System.err.println(e.toString());
 			}
 			camera.setBrightness(pipeline.brightness);
-			HashMap<String, Object> pipeChange = new HashMap<>();
-			pipeChange.put("curr_pipeline", ntPipelineIndex);
-			ServerHandler.broadcastMessage(pipeChange);
-			ServerHandler.sendFullSettings();
+			if (SettingsManager.GeneralSettings.curr_camera.equals(cameraName)){
+				SettingsManager.GeneralSettings.curr_pipeline = ntPipelineIndex;
+				HashMap<String, Object> pipeChange = new HashMap<>();
+				pipeChange.put("curr_pipeline", ntPipelineIndex);
+				ServerHandler.broadcastMessage(pipeChange);
+				ServerHandler.sendFullSettings();
 
+			}
 		} else {
 			ntPipelineEntry.setString("pipeline" + camera.getCurrentPipelineIndex());
 		}
diff --git a/Main/src/main/java/com/chameleonvision/web/ServerHandler.java b/Main/src/main/java/com/chameleonvision/web/ServerHandler.java
index 3ccc992c2..40c113c77 100644
--- a/Main/src/main/java/com/chameleonvision/web/ServerHandler.java
+++ b/Main/src/main/java/com/chameleonvision/web/ServerHandler.java
@@ -104,7 +104,7 @@ public class ServerHandler {
                     System.out.printf("Changing pipeline to %s\n", newPipeline);
                     CameraManager.setCurrentPipeline(pipelineNumber);
                     var Proccess =  CameraManager.getCurrentCameraProcess();
-                    Proccess.ntPipelineEntry.setString(newPipeline);
+                    Proccess.ntPipelineEntry.setString("pipeline"+pipelineNumber);
                     broadcastMessage(allFieldsToMap(CameraManager.getCurrentPipeline()));
 
                     break;