diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 92551d485d..d40c4ea87c 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -366,7 +366,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 					dat += "High"
 			dat += "</a><br>"
 
-			dat += "<b>Screen Shake:</b> <a href='?_src_=prefs;preference=screenshake'>[(screenshake==100) ? "Full" : ((screenshake==0) ? "None" : [screenshake])]</a><br>"
+			dat += "<b>Screen Shake:</b> <a href='?_src_=prefs;preference=screenshake'>[(screenshake==100) ? "Full" : ((screenshake==0) ? "None" : "[screenshake]")]</a><br>"
 
 			if (!user.client.prefs.screenshake==0)
 				dat += "<b>Damage Screen Shake:</b> <a href='?_src_=prefs;preference=damagescreenshake'>[(damagescreenshake==1) ? "On" : ((damagescreenshake==0) ? "Off" : "Only when down")]</a><br>"
diff --git a/modular_citadel/cit_screenshake.dm b/modular_citadel/cit_screenshake.dm
index 8bdc4003ab..2d0110c4e7 100644
--- a/modular_citadel/cit_screenshake.dm
+++ b/modular_citadel/cit_screenshake.dm
@@ -8,8 +8,9 @@
 		return
 	var/oldx = C.pixel_x
 	var/oldy = C.pixel_y
-	var/max = ((C.prefs.screenshake==1) ? strength : strength*0.25) *world.icon_size
-	var/min = -(((C.prefs.screenshake==1) ? strength : strength*0.25)*world.icon_size)
+	var/clientscreenshake = (C.prefs.screenshake * 0.01)
+	var/max = (strength*clientscreenshake) * world.icon_size
+	var/min = -((strength*clientscreenshake) * world.icon_size)
 
 	for(var/i in 0 to duration-1)
 		if (i == 0)