diff --git a/components.d.ts b/components.d.ts
index a6c01dee7c..18415dab4b 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -14,6 +14,7 @@ declare module 'vue' {
     ActionCommandPromptDialog: typeof import('./src/components/common/ActionCommandPromptDialog.vue')['default']
     AddInstanceDialog: typeof import('./src/components/common/AddInstanceDialog.vue')['default']
     AppAnnouncementDismissMenu: typeof import('./src/components/layout/AppAnnouncementDismissMenu.vue')['default']
+    AppAutoScrollContainer: typeof import('./src/components/ui/AppAutoScrollContainer.vue')['default']
     AppBar: typeof import('./src/components/layout/AppBar.vue')['default']
     AppBtn: typeof import('./src/components/ui/AppBtn.vue')['default']
     AppBtnCollapse: typeof import('./src/components/ui/AppBtnCollapse.vue')['default']
diff --git a/package-lock.json b/package-lock.json
index a2fb8ca84c..45804e5c7c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -44,7 +44,6 @@
         "vue-meta": "^2.4.0",
         "vue-property-decorator": "^9.1.2",
         "vue-router": "^3.6.5",
-        "vue-virtual-scroller": "^1.1.2",
         "vue2-touch-events": "^3.2.3",
         "vuetify": "^2.7.2",
         "vuetify-confirm": "^2.0.6",
@@ -14353,12 +14352,6 @@
         "node": ">=v12.22.7"
       }
     },
-    "node_modules/scrollparent": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/scrollparent/-/scrollparent-2.1.0.tgz",
-      "integrity": "sha512-bnnvJL28/Rtz/kz2+4wpBjHzWoEzXhVg/TE8BeVGJHUqE8THNIRnDxDWMktwM+qahvlRdvlLdsQfYe+cuqfZeA==",
-      "license": "ISC"
-    },
     "node_modules/scslre": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/scslre/-/scslre-0.3.0.tgz",
@@ -16836,12 +16829,6 @@
         "deepmerge": "^4.2.2"
       }
     },
-    "node_modules/vue-observe-visibility": {
-      "version": "0.4.6",
-      "resolved": "https://registry.npmjs.org/vue-observe-visibility/-/vue-observe-visibility-0.4.6.tgz",
-      "integrity": "sha512-xo0CEVdkjSjhJoDdLSvoZoQrw/H2BlzB5jrCBKGZNXN2zdZgMuZ9BKrxXDjNP2AxlcCoKc8OahI3F3r3JGLv2Q==",
-      "license": "MIT"
-    },
     "node_modules/vue-property-decorator": {
       "version": "9.1.2",
       "resolved": "https://registry.npmjs.org/vue-property-decorator/-/vue-property-decorator-9.1.2.tgz",
@@ -16852,15 +16839,6 @@
         "vue-class-component": "*"
       }
     },
-    "node_modules/vue-resize": {
-      "version": "0.4.5",
-      "resolved": "https://registry.npmjs.org/vue-resize/-/vue-resize-0.4.5.tgz",
-      "integrity": "sha512-bhP7MlgJQ8TIkZJXAfDf78uJO+mEI3CaLABLjv0WNzr4CcGRGPIAItyWYnP6LsPA4Oq0WE+suidNs6dgpO4RHg==",
-      "license": "MIT",
-      "peerDependencies": {
-        "vue": "^2.3.0"
-      }
-    },
     "node_modules/vue-router": {
       "version": "3.6.5",
       "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.6.5.tgz",
@@ -16895,20 +16873,6 @@
         "typescript": ">=5.0.0"
       }
     },
-    "node_modules/vue-virtual-scroller": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/vue-virtual-scroller/-/vue-virtual-scroller-1.1.2.tgz",
-      "integrity": "sha512-SkUyc7QHCJFB5h1Fya7LxVizlVzOZZuFVipBGHYoTK8dwLs08bIz/tclvRApYhksaJIm/nn51inzO2UjpGJPMQ==",
-      "license": "MIT",
-      "dependencies": {
-        "scrollparent": "^2.0.1",
-        "vue-observe-visibility": "^0.4.4",
-        "vue-resize": "^0.4.5"
-      },
-      "peerDependencies": {
-        "vue": "^2.6.11"
-      }
-    },
     "node_modules/vue/node_modules/@vue/compiler-sfc": {
       "version": "2.7.16",
       "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.16.tgz",
diff --git a/package.json b/package.json
index 5297c2dc2c..545e0f7263 100644
--- a/package.json
+++ b/package.json
@@ -64,7 +64,6 @@
     "vue-meta": "^2.4.0",
     "vue-property-decorator": "^9.1.2",
     "vue-router": "^3.6.5",
-    "vue-virtual-scroller": "^1.1.2",
     "vue2-touch-events": "^3.2.3",
     "vuetify": "^2.7.2",
     "vuetify-confirm": "^2.0.6",
diff --git a/src/components/common/UpdatingDialog.vue b/src/components/common/UpdatingDialog.vue
index a5939be7cf..cdeeae55f2 100644
--- a/src/components/common/UpdatingDialog.vue
+++ b/src/components/common/UpdatingDialog.vue
@@ -11,7 +11,6 @@
       <console
         :items="responses"
         :fullscreen="isMobileViewport"
-        :height="250"
         readonly
       />
     </v-card-text>
diff --git a/src/components/layout/AppObservedColumn.vue b/src/components/layout/AppObservedColumn.vue
index 28f12c395c..2bd7fab557 100644
--- a/src/components/layout/AppObservedColumn.vue
+++ b/src/components/layout/AppObservedColumn.vue
@@ -37,10 +37,8 @@ export default class AppObservedColumn extends Vue {
   }
 
   beforeDestroy () {
-    if (this.observer) {
-      this.observer.disconnect()
-      this.observer = null
-    }
+    this.observer?.disconnect()
+    this.observer = null
   }
 }
 </script>
diff --git a/src/components/ui/AppAutoScrollContainer.vue b/src/components/ui/AppAutoScrollContainer.vue
new file mode 100644
index 0000000000..7678a1990a
--- /dev/null
+++ b/src/components/ui/AppAutoScrollContainer.vue
@@ -0,0 +1,99 @@
+<template>
+  <div
+    ref="box"
+    class="app-auto-scroll-container"
+    @scroll="updateAutoScrollPaused"
+  >
+    <slot />
+  </div>
+</template>
+
+<script lang="ts">
+import { Component, Prop, Ref, Vue, Watch } from 'vue-property-decorator'
+import { markRaw } from 'vue'
+
+@Component
+export default class AppAutoScrollContainer extends Vue {
+  @Prop({ type: Boolean })
+  readonly reversed?: boolean
+
+  @Ref('box')
+  readonly box!: HTMLElement
+
+  autoScrollPaused = false
+  resizeObserver: ResizeObserver | null = null
+
+  @Watch('reversed')
+  onReversed () {
+    this.scrollToLatest(true)
+  }
+
+  @Watch('autoScrollPaused')
+  onAutoScrollPaused (value: boolean) {
+    this.$emit('update:auto-scroll-paused', value)
+  }
+
+  mounted () {
+    this.scrollToLatest()
+    if (typeof ResizeObserver !== 'undefined') {
+      this.resizeObserver = markRaw(new ResizeObserver(() => this.updateAutoScrollPaused()))
+      this.resizeObserver.observe(this.box)
+    }
+  }
+
+  updated () {
+    this.scrollToLatest()
+  }
+
+  beforeDestroy () {
+    this.resizeObserver?.disconnect()
+    this.resizeObserver = null
+  }
+
+  private updateAutoScrollPaused () {
+    this.autoScrollPaused = (
+      this.reversed
+        ? this.getScrollTop()
+        : this.getScrollBottom()
+    ) > 1
+  }
+
+  scrollToLatest (force?: boolean) {
+    if (
+      !force &&
+      this.autoScrollPaused
+    ) {
+      return
+    }
+
+    this.$nextTick(() => {
+      this.setScrollTop(
+        this.reversed
+          ? 0
+          : this.box.scrollHeight
+      )
+      this.autoScrollPaused = false
+    })
+  }
+
+  private getScrollTop () {
+    return this.box.scrollTop
+  }
+
+  private setScrollTop (value: number) {
+    this.box.scrollTop = value
+  }
+
+  private getScrollBottom () {
+    const { scrollTop, scrollHeight, clientHeight } = this.box
+
+    return scrollHeight - clientHeight - scrollTop
+  }
+}
+</script>
+<style lang="scss" scoped>
+  .app-auto-scroll-container {
+    overflow-y: auto;
+    overflow-x: hidden;
+  }
+</style>
diff --git a/src/components/widgets/console/Console.vue b/src/components/widgets/console/Console.vue
index c0d6dac893..47e8cfe103 100644
--- a/src/components/widgets/console/Console.vue
+++ b/src/components/widgets/console/Console.vue
@@ -8,40 +8,26 @@
       @send="sendCommand"
     />
     <v-card
-      ref="console-wrapper"
       flat
       class="console-wrapper"
     >
-      <DynamicScroller
-        ref="scroller"
-        :items="flipLayout ? [...items].reverse() : items"
-        :min-item-size="24"
+      <app-auto-scroll-container
+        ref="consoleScroller"
         class="console-scroller"
         :class="{
           'console-scroller-fullscreen': fullscreen
         }"
-        key-field="id"
-        :buffer="600"
-        @resize="scrollToLatest()"
+        :reversed="flipLayout"
+        v-on="$listeners"
       >
-        <template #default="{ item, index, active }">
-          <DynamicScrollerItem
-            :item="item"
-            :active="active"
-            :size-dependencies="[
-              item.message,
-            ]"
-            :data-index="index"
-          >
-            <console-item
-              :key="item.id"
-              :value="item"
-              class="console-item"
-              @click="handleEntryClick"
-            />
-          </DynamicScrollerItem>
-        </template>
-      </DynamicScroller>
+        <console-item
+          v-for="item in orderedItems"
+          :key="item.id"
+          :value="item"
+          class="console-item"
+          @click="handleEntryClick"
+        />
+      </app-auto-scroll-container>
     </v-card>
     <console-command
       v-if="!readonly && !flipLayout"
@@ -54,14 +40,14 @@
 </template>
 
 <script lang="ts">
-import { Component, Prop, Mixins, Watch, Ref, PropSync } from 'vue-property-decorator'
+import { Component, Prop, Mixins, Ref } from 'vue-property-decorator'
 import StateMixin from '@/mixins/state'
 import ConsoleCommand from './ConsoleCommand.vue'
 import ConsoleItem from './ConsoleItem.vue'
 import { SocketActions } from '@/api/socketActions'
-import type { DinamicScroller } from 'vue-virtual-scroller'
 import type { ConsoleEntry } from '@/store/console/types'
 import type { UpdateResponse } from '@/store/version/types'
+import type AppAutoScrollContainer from '@/components/ui/AppAutoScrollContainer.vue'
 
 @Component({
   components: {
@@ -70,7 +56,7 @@ import type { UpdateResponse } from '@/store/version/types'
   }
 })
 export default class Console extends Mixins(StateMixin) {
-  @Prop({ type: [Array<ConsoleEntry>, Array<UpdateResponse>], default: () => [] })
+  @Prop({ type: [Array], default: () => [] })
   readonly items!: ConsoleEntry[] | UpdateResponse[]
 
   @Prop({ type: Boolean })
@@ -79,13 +65,8 @@ export default class Console extends Mixins(StateMixin) {
   @Prop({ type: Boolean })
   readonly readonly?: boolean
 
-  @PropSync('scrollingPaused', { type: Boolean })
-  scrollingPausedModel?: boolean
-
-  @Ref('scroller')
-  readonly dynamicScroller!: DinamicScroller
-
-  _pauseScroll = false
+  @Ref('consoleScroller')
+  readonly consoleScrollerElement!: AppAutoScrollContainer
 
   get currentCommand (): string {
     return this.$typedState.console.consoleCommand
@@ -99,79 +80,18 @@ export default class Console extends Mixins(StateMixin) {
     return this.$typedState.config.uiSettings.general.flipConsoleLayout
   }
 
-  set flipLayout (_) {
-    this.scrollToLatest(true)
-  }
-
-  mounted () {
-    this.dynamicScroller.$el.addEventListener('scroll', this.onScroll)
+  get orderedItems () {
+    return this.flipLayout
+      ? [...this.items].reverse()
+      : this.items
   }
 
-  beforeDestroy () {
-    this.dynamicScroller.$el.removeEventListener('scroll', this.onScroll)
-  }
-
-  @Watch('items', { immediate: true })
-  onItemsChange (_: unknown, oldItems: unknown[]) {
-    if (this.dynamicScroller) {
-      const el = this.dynamicScroller.$el
-
-      if (this.flipLayout && (this._pauseScroll || !this.$typedState.console.autoScroll)) {
-        const { scrollHeight, clientHeight } = el
-
-        if (scrollHeight > clientHeight) {
-          this.$nextTick(() => {
-            el.scrollTop += el.scrollHeight - scrollHeight
-          })
-        }
-      } else {
-        this.scrollToLatest(oldItems?.length === 0)
-      }
-    }
-  }
-
-  updateScrollingPaused () {
-    this.$nextTick(() => {
-      const { scrollTop, scrollHeight, clientHeight } = this.dynamicScroller.$el
-
-      const pauseScroll = this.flipLayout ? scrollTop > 1 : scrollHeight - scrollTop - clientHeight > 1
-
-      if (this._pauseScroll !== pauseScroll) {
-        this._pauseScroll = pauseScroll
-        this.scrollingPausedModel = pauseScroll
-      }
-    })
-  }
-
-  onScroll () {
-    this.updateScrollingPaused()
-  }
-
-  scrollToLatest (force?: boolean) {
-    if (this._pauseScroll && !force) return
-
-    if (this.dynamicScroller) {
-      if (
-        this.$typedState.console.autoScroll ||
-        this.readonly ||
-        force
-      ) {
-        if (this.flipLayout) {
-          this.dynamicScroller.scrollToItem(0)
-        } else {
-          this.dynamicScroller.scrollToBottom()
-        }
-      }
-
-      if (force) {
-        // The fixed/floating nature of the console may only change if the scroll is forced.
-        this.updateScrollingPaused()
-      }
-    }
+  scrollToLatest () {
+    this.consoleScrollerElement.scrollToLatest(true)
   }
 
   sendCommand (command?: string) {
-    if (command && command.length) {
+    if (command) {
       // If clients detect M112 input from the console, we should invoke the emergency_stop endpoint
       if (command.trim().toLowerCase() === 'm112') {
         SocketActions.printerEmergencyStop()
@@ -202,6 +122,7 @@ export default class Console extends Mixins(StateMixin) {
   .console-scroller {
     height: 300px;
   }
+
   .console-scroller-fullscreen {
     height: calc(100vh - 260px);
     height: calc(100svh - 260px);
@@ -210,9 +131,4 @@ export default class Console extends Mixins(StateMixin) {
   .v-input {
     flex: 0 0 auto;
   }
-
-  :deep(.vue-recycle-scroller__item-wrapper) {
-    overflow: revert;
-  }
-
 </style>
diff --git a/src/components/widgets/console/ConsoleCard.vue b/src/components/widgets/console/ConsoleCard.vue
index 105204b174..6e7ad2f533 100644
--- a/src/components/widgets/console/ConsoleCard.vue
+++ b/src/components/widgets/console/ConsoleCard.vue
@@ -14,9 +14,9 @@
   >
     <template #menu>
       <app-btn
-        v-if="scrollingPaused"
+        v-if="autoScrollPaused"
         icon
-        @click="consoleElement.scrollToLatest(true)"
+        @click="consoleElement.scrollToLatest()"
       >
         <v-icon dense>
           {{ flipLayout ? '$up' : '$down' }}
@@ -73,17 +73,6 @@
             </v-list-item-content>
           </v-list-item>
 
-          <v-list-item @click="autoScroll = !autoScroll">
-            <v-list-item-action class="my-0">
-              <v-checkbox :input-value="autoScroll" />
-            </v-list-item-action>
-            <v-list-item-content>
-              <v-list-item-title>
-                {{ $t('app.console.label.auto_scroll') }}
-              </v-list-item-title>
-            </v-list-item-content>
-          </v-list-item>
-
           <v-list-item @click="flipLayout = !flipLayout">
             <v-list-item-action class="my-0">
               <v-checkbox :input-value="flipLayout" />
@@ -119,9 +108,9 @@
 
     <console
       ref="console"
-      :scrolling-paused.sync="scrollingPaused"
       :items="items"
       :fullscreen="fullscreen"
+      @update:auto-scroll-paused="autoScrollPaused = $event"
     />
   </collapsable-card>
 </template>
@@ -143,7 +132,7 @@ export default class ConsoleCard extends Vue {
   @Ref('console')
   readonly consoleElement!: Console
 
-  scrollingPaused = false
+  autoScrollPaused = false
 
   get filters (): ConsoleFilter[] {
     return this.$typedState.console.consoleFilters
@@ -171,8 +160,6 @@ export default class ConsoleCard extends Vue {
       value,
       server: true
     })
-
-    this.consoleElement.flipLayout = value
   }
 
   get items (): ConsoleEntry[] {
@@ -183,17 +170,6 @@ export default class ConsoleCard extends Vue {
     return (this.$typedState.config.layoutMode)
   }
 
-  get autoScroll (): boolean {
-    return this.$typedState.console.autoScroll
-  }
-
-  set autoScroll (value: boolean) {
-    this.$typedDispatch('console/onUpdateAutoScroll', value)
-    if (value) {
-      this.consoleElement.scrollToLatest(true)
-    }
-  }
-
   @Watch('inLayout')
   inLayoutChange (inLayout: boolean) {
     if (!inLayout) {
diff --git a/src/components/widgets/console/ConsoleItem.vue b/src/components/widgets/console/ConsoleItem.vue
index 2d80d25bec..fe391ea67c 100644
--- a/src/components/widgets/console/ConsoleItem.vue
+++ b/src/components/widgets/console/ConsoleItem.vue
@@ -1,7 +1,7 @@
 <template>
   <v-layout class="console-item">
     <span
-      v-if="value.time"
+      v-if="itemTime"
       class="secondary--text mr-3 d-none d-sm-block text-no-wrap"
     >
       {{ itemTime }}&nbsp;
@@ -18,31 +18,43 @@
 import { Component, Prop, Vue } from 'vue-property-decorator'
 import { Globals } from '@/globals'
 import type { ConsoleEntry } from '@/store/console/types'
+import type { UpdateResponse } from '@/store/version/types'
 
 @Component({})
 export default class ConsoleItem extends Vue {
-  @Prop({ type: Object, default: () => {} })
-  readonly value!: ConsoleEntry
+  @Prop({ type: Object, required: true })
+  readonly value!: ConsoleEntry | UpdateResponse
 
   get knownCommands (): Moonraker.KlippyApis.GcodeHelpResponse {
     return this.$typedGetters['console/getAllKnownCommands']
   }
 
   get itemMessage () {
-    let message = this.value.message
-    if (this.value.type === 'response') {
-      message = this.value.message.replace(/([A-Z_][A-Z0-9_.]+)/g, (match, command) => {
-        if (command in this.knownCommands) return `<a class="primary--text text--lighten-1">${command.toUpperCase()}</a>`
-        return match
-      })
+    const message = this.value.message
+
+    if ('type' in this.value) {
+      switch (this.value.type) {
+        case 'command':
+          return `${Globals.CONSOLE_SEND_PREFIX}<a class="primary--text text--lighten-1">${message}</a>`
+
+        case 'response':
+          return message
+            .replace(/([A-Z_][A-Z0-9_.]+)/g, (match, command) => (
+              command in this.knownCommands
+                ? `<a class="primary--text text--lighten-1">${command.toUpperCase()}</a>`
+                : match
+            ))
+      }
     }
-    return (this.value.type === 'command')
-      ? `${Globals.CONSOLE_SEND_PREFIX}<a class="primary--text text--lighten-1">${message}</a>`
-      : message
+
+    return message
   }
 
   get itemTime () {
-    return (this.value.time)
+    return (
+      'time' in this.value &&
+      this.value.time
+    )
       ? this.$filters.formatTimeWithSeconds(this.value.time * 1000)
       : ''
   }
@@ -52,11 +64,10 @@ export default class ConsoleItem extends Vue {
       return { 'error--text': true }
     }
 
-    // if (this.value.message.startsWith('//')) {
-    //   return { 'secondary--text': true }
-    // }
-
-    if (this.value.type === 'command') {
+    if (
+      'type' in this.value &&
+      this.value.type === 'command'
+    ) {
       return { 'primary--text': true }
     }
 
diff --git a/src/main.ts b/src/main.ts
index 084d21675a..42a1c4c011 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,6 +1,5 @@
 // Styles
 import '@/scss/global.scss'
-import 'vue-virtual-scroller/dist/vue-virtual-scroller.css'
 
 // Global Registrations
 import './registerComponentHooks'
@@ -14,7 +13,6 @@ import store from './store'
 
 // 3rd party.
 import vuetify from './plugins/vuetify'
-import VueVirtualScroller from 'vue-virtual-scroller'
 import VueMeta from 'vue-meta'
 import VuetifyConfirm from 'vuetify-confirm'
 import Vue2TouchEvents from 'vue2-touch-events'
@@ -41,7 +39,6 @@ Vue.directive('safe-html', SafeHtml)
 Vue.component('EChart', () => import('./vue-echarts-chunk'))
 
 // Use any Plugins
-Vue.use(VueVirtualScroller)
 Vue.use(FiltersPlugin)
 Vue.use(VueMeta)
 Vue.use(ColorSetPlugin, {})
diff --git a/src/typings/vue-virtual-scroller.d.ts b/src/typings/vue-virtual-scroller.d.ts
deleted file mode 100644
index 60abee794a..0000000000
--- a/src/typings/vue-virtual-scroller.d.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-declare module 'vue-virtual-scroller' {
-  import Vue, { PluginObject } from 'vue'
-
-  declare const VueVirtualScroller: PluginObject<any>
-
-  export interface DinamicScroller extends Vue {
-    scrollToItem: (index: number) => void,
-    scrollToBottom: () => void
-  }
-
-  export default VueVirtualScroller
-}