diff --git a/Main/src/main/java/com/chameleonvision/vision/camera/CameraManager.java b/Main/src/main/java/com/chameleonvision/vision/camera/CameraManager.java
index 33f11589b..c16fb0cbd 100644
--- a/Main/src/main/java/com/chameleonvision/vision/camera/CameraManager.java
+++ b/Main/src/main/java/com/chameleonvision/vision/camera/CameraManager.java
@@ -118,6 +118,10 @@ public class CameraManager {
 		SettingsManager.GeneralSettings.currentCamera = cameraName;
 		SettingsManager.updateCameraSetting(cameraName, getCurrentCamera().getCurrentPipelineIndex());
 	}
+	public static void setCurrentCamera(int cameraIndex) throws CameraException {
+		List<String> s =   new ArrayList<String>(AllCamerasByName.keySet());
+		setCurrentCamera(s.get(cameraIndex));
+	}
 
 	public static Pipeline getCurrentPipeline() throws CameraException {
 		return getCurrentCamera().getCurrentPipeline();
diff --git a/Main/src/main/java/com/chameleonvision/web/ServerHandler.java b/Main/src/main/java/com/chameleonvision/web/ServerHandler.java
index 98b177701..f50188d34 100644
--- a/Main/src/main/java/com/chameleonvision/web/ServerHandler.java
+++ b/Main/src/main/java/com/chameleonvision/web/ServerHandler.java
@@ -111,7 +111,7 @@ public class ServerHandler {
                         break;
                     }
                     case "currentCamera": {
-                        CameraManager.setCurrentCamera((String) entry.getValue());
+                        CameraManager.setCurrentCamera((Integer) entry.getValue());
                         sendFullSettings();
                         break;
                     }