diff --git a/code/modules/assembly/proximity.dm b/code/modules/assembly/proximity.dm
index 488498a58b..93e8cd1108 100644
--- a/code/modules/assembly/proximity.dm
+++ b/code/modules/assembly/proximity.dm
@@ -135,7 +135,7 @@
 				for(var/i in 1 to LAZYLEN(L))
 					real_new_time += text2num(L[i]) * (60 ** (LAZYLEN(L) - i))
 			else
-				real_new_time = text2num(new_time * 10)
+				real_new_time = text2num(new_time)
 			time = clamp(real_new_time, 0, 600)
 			return TRUE
 		if("range")
diff --git a/code/modules/assembly/timer.dm b/code/modules/assembly/timer.dm
index 13e4c63043..58804b4a5f 100644
--- a/code/modules/assembly/timer.dm
+++ b/code/modules/assembly/timer.dm
@@ -94,6 +94,6 @@
 				for(var/i in 1 to LAZYLEN(L))
 					real_new_time += text2num(L[i]) * (60 ** (LAZYLEN(L) - i))
 			else
-				real_new_time = text2num(new_time * 10)
+				real_new_time = text2num(new_time)
 			time = clamp(real_new_time, 0, 600)
 			return TRUE
diff --git a/tgui/packages/tgui/interfaces/AssemblyProx.jsx b/tgui/packages/tgui/interfaces/AssemblyProx.jsx
index a569ab8113..7e1761bef7 100644
--- a/tgui/packages/tgui/interfaces/AssemblyProx.jsx
+++ b/tgui/packages/tgui/interfaces/AssemblyProx.jsx
@@ -28,9 +28,9 @@ export const AssemblyProx = (props) => {
               <NumberInput
                 animated
                 fluid
-                value={time / 10}
+                value={time}
                 minValue={0}
-                maxValue={60}
+                maxValue={600}
                 format={(val) => formatTime(round(val * 10))}
                 onDrag={(e, val) => act('set_time', { time: val })}
               />
diff --git a/tgui/packages/tgui/interfaces/AssemblyTimer.jsx b/tgui/packages/tgui/interfaces/AssemblyTimer.jsx
index 98b64eaa62..02d6f8b0e6 100644
--- a/tgui/packages/tgui/interfaces/AssemblyTimer.jsx
+++ b/tgui/packages/tgui/interfaces/AssemblyTimer.jsx
@@ -28,9 +28,9 @@ export const AssemblyTimer = (props) => {
               <NumberInput
                 animated
                 fluid
-                value={time / 10}
+                value={time}
                 minValue={0}
-                maxValue={60}
+                maxValue={600}
                 format={(val) => formatTime(round(val * 10))}
                 onDrag={(e, val) => act('set_time', { time: val })}
               />