diff --git a/src/components/panels/Miscellaneous/MoonrakerSensor.vue b/src/components/panels/Miscellaneous/MoonrakerSensor.vue
new file mode 100644
index 000000000..e0b919518
--- /dev/null
+++ b/src/components/panels/Miscellaneous/MoonrakerSensor.vue
@@ -0,0 +1,48 @@
+<template>
+    <v-container class="px-0 py-2">
+        <v-row>
+            <v-col class="pb-3">
+                <v-subheader class="mb-1 d-block _moonraker-sensor-subheader">
+                    {{ convertName(name) }}
+                </v-subheader>
+                <v-subheader class="d-block _moonraker-sensor-subheader">
+                    <moonraker-sensor-value
+                        v-for="(valueName, index) of valueNames"
+                        :key="'moonraker_sensor_value_' + index"
+                        :sensor="name"
+                        :value-name="valueName" />
+                </v-subheader>
+            </v-col>
+        </v-row>
+    </v-container>
+</template>
+
+<script lang="ts">
+import { convertName } from '@/plugins/helpers'
+import { Component, Mixins, Prop } from 'vue-property-decorator'
+import BaseMixin from '@/components/mixins/base'
+import MoonrakerSensorValue from '@/components/panels/Miscellaneous/MoonrakerSensorValue.vue'
+import {} from '@mdi/js'
+
+@Component({
+    components: { MoonrakerSensorValue },
+})
+export default class MoonrakerSensor extends Mixins(BaseMixin) {
+    convertName = convertName
+
+    @Prop({ type: String, required: true }) declare readonly name: string
+
+    get valueNames() {
+        const sensors = this.$store.state.server.sensor.sensors
+        if (!(this.name in sensors)) return []
+
+        return Object.keys(sensors[this.name].values)
+    }
+}
+</script>
+
+<style scoped>
+._moonraker-sensor-subheader {
+    height: auto;
+}
+</style>
diff --git a/src/components/panels/Miscellaneous/MoonrakerSensorValue.vue b/src/components/panels/Miscellaneous/MoonrakerSensorValue.vue
new file mode 100644
index 000000000..1ac9f31c2
--- /dev/null
+++ b/src/components/panels/Miscellaneous/MoonrakerSensorValue.vue
@@ -0,0 +1,92 @@
+<template>
+    <div class="d-flex w-100 flex-row align-center">
+        <v-icon small left>{{ symbol }}</v-icon>
+        <span class="flex-grow-1">{{ name }}:</span>
+        <span>{{ output }}</span>
+    </div>
+</template>
+
+<script lang="ts">
+import { convertName } from '@/plugins/helpers'
+import { Component, Mixins, Prop } from 'vue-property-decorator'
+import BaseMixin from '@/components/mixins/base'
+import { mdiGauge, mdiLightningBoltOutline, mdiFlash, mdiThermometer, mdiMeterElectricOutline } from '@mdi/js'
+
+@Component
+export default class MoonrakerSensorValue extends Mixins(BaseMixin) {
+    convertName = convertName
+
+    @Prop({ type: String, required: true }) declare readonly sensor: string
+    @Prop({ type: String, required: true }) declare readonly valueName: string
+
+    mdiGauge = mdiGauge
+    mdiLightningBoltOutline = mdiLightningBoltOutline
+    mdiFlash = mdiFlash
+    mdiThermometer = mdiThermometer
+    mdiMeterElectricOutline = mdiMeterElectricOutline
+
+    get sensorData() {
+        const sensors = this.$store.state.server.sensor.sensors
+        if (!(this.sensor in sensors)) return {}
+
+        return sensors[this.sensor].values
+    }
+
+    get sensorConfig() {
+        const name = `sensor ${this.sensor}`
+        const serverConfig = this.$store.state.server.config?.config ?? {}
+        if (!(name in serverConfig)) return {}
+
+        return serverConfig[name]
+    }
+
+    get parameterConfig() {
+        const name = `parameter_${this.valueName}`
+        if (!(name in this.sensorConfig)) return {}
+
+        return this.sensorConfig[name]
+    }
+
+    get unit() {
+        if (!('units' in this.parameterConfig)) return null
+
+        return this.parameterConfig.units
+    }
+
+    get value() {
+        if (!(this.valueName in this.sensorData)) return '--'
+
+        return Math.round(this.sensorData[this.valueName] * 1000) / 1000
+    }
+
+    get output() {
+        if (this.unit === null) return this.value
+
+        return `${this.value} ${this.unit}`
+    }
+
+    get name() {
+        return this.convertName(this.valueName)
+    }
+
+    get symbol() {
+        if (['wh', 'kwh', 'mwh', 'j'].includes(this.unit?.toLowerCase())) {
+            return this.mdiLightningBoltOutline
+        }
+
+        if (['w', 'v'].includes(this.unit?.toLowerCase())) {
+            return this.mdiFlash
+        }
+
+        if (this.unit?.toLowerCase() === 'a') {
+            return this.mdiMeterElectricOutline
+        }
+
+        if (['°c', 'c', '°f', 'f', '°'].includes(this.unit?.toLowerCase())) {
+            return this.mdiThermometer
+        }
+
+        return this.mdiGauge
+    }
+}
+</script>
diff --git a/src/components/panels/MiscellaneousPanel.vue b/src/components/panels/MiscellaneousPanel.vue
index 9a671d075..976e4cf88 100644
--- a/src/components/panels/MiscellaneousPanel.vue
+++ b/src/components/panels/MiscellaneousPanel.vue
@@ -8,7 +8,7 @@
         :collapsible="true"
         card-class="miscellaneous-panel">
         <div v-for="(object, index) of miscellaneous" :key="index">
-            <v-divider v-if="index"></v-divider>
+            <v-divider v-if="index" />
             <miscellaneous-slider
                 :name="object.name"
                 :type="object.type"
@@ -18,10 +18,10 @@
                 :pwm="object.pwm"
                 :off_below="object.off_below"
                 :max="object.max_power"
-                :multi="parseInt(object.scale)"></miscellaneous-slider>
+                :multi="parseInt(object.scale)" />
         </div>
         <div v-for="(light, index) of lights" :key="'light_' + light.name">
-            <v-divider v-if="index || miscellaneous.length"></v-divider>
+            <v-divider v-if="index || miscellaneous.length" />
             <miscellaneous-slider
                 v-if="light.type === 'led' && light.colorOrder.length === 1"
                 :name="light.name"
@@ -34,11 +34,15 @@
             <miscellaneous-light v-else :object="light" :root="true" />
         </div>
         <div v-for="(sensor, index) of filamentSensors" :key="'sensor_' + index">
-            <v-divider v-if="index || miscellaneous.length || lights.length"></v-divider>
+            <v-divider v-if="index || miscellaneous.length || lights.length" />
             <filament-sensor
                 :name="sensor.name"
                 :enabled="sensor.enabled"
-                :filament_detected="sensor.filament_detected"></filament-sensor>
+                :filament_detected="sensor.filament_detected" />
+        </div>
+        <div v-for="(sensor, index) of moonrakerSensors" :key="'moonraker_sensor_' + index">
+            <v-divider v-if="index || miscellaneous.length || lights.length || filamentSensors.length" />
+            <moonraker-sensor :name="sensor" />
         </div>
     </panel>
 </template>
@@ -49,10 +53,11 @@ import BaseMixin from '@/components/mixins/base'
 import MiscellaneousSlider from '@/components/inputs/MiscellaneousSlider.vue'
 import MiscellaneousLight from '@/components/inputs/MiscellaneousLight.vue'
 import FilamentSensor from '@/components/inputs/FilamentSensor.vue'
+import MoonrakerSensor from '@/components/panels/Miscellaneous/MoonrakerSensor.vue'
 import Panel from '@/components/ui/Panel.vue'
 import { mdiDipSwitch } from '@mdi/js'
 @Component({
-    components: { Panel, FilamentSensor, MiscellaneousSlider, MiscellaneousLight },
+    components: { Panel, FilamentSensor, MiscellaneousSlider, MiscellaneousLight, MoonrakerSensor },
 })
 export default class MiscellaneousPanel extends Mixins(BaseMixin) {
     mdiDipSwitch = mdiDipSwitch
@@ -69,6 +74,10 @@ export default class MiscellaneousPanel extends Mixins(BaseMixin) {
         return this.$store.getters['printer/getLights'] ?? []
     }
 
+    get moonrakerSensors() {
+        return this.$store.getters['server/sensor/getSensors'] ?? []
+    }
+
     get showMiscellaneousPanel() {
         return (
             this.klipperReadyForGui && (this.miscellaneous.length || this.filamentSensors.length || this.lights.length)
diff --git a/src/store/server/sensor/getters.ts b/src/store/server/sensor/getters.ts
index b0b84ee3c..10028f160 100644
--- a/src/store/server/sensor/getters.ts
+++ b/src/store/server/sensor/getters.ts
@@ -2,4 +2,8 @@ import { GetterTree } from 'vuex'
 import { ServerSensorState } from '@/store/server/sensor/types'
 
 // eslint-disable-next-line
-export const getters: GetterTree<ServerSensorState, any> = {}
+export const getters: GetterTree<ServerSensorState, any> = {
+    getSensors: (state) => {
+        return Object.keys(state.sensors)
+    },
+}
diff --git a/src/store/server/sensor/mutations.ts b/src/store/server/sensor/mutations.ts
index 5f4df98f4..2e9a7b841 100644
--- a/src/store/server/sensor/mutations.ts
+++ b/src/store/server/sensor/mutations.ts
@@ -13,6 +13,8 @@ export const mutations: MutationTree<ServerSensorState> = {
     },
 
     updateSensor(state, payload) {
-        Vue.set(state.sensors, payload.key, payload.value)
+        if (!(payload.key in state.sensors)) return
+
+        Vue.set(state.sensors[payload.key], 'values', payload.value)
     },
 }