diff --git a/src/components/EventList.js b/src/components/EventList.js
index ef0b2e9..e7fdd15 100644
--- a/src/components/EventList.js
+++ b/src/components/EventList.js
@@ -8,6 +8,8 @@ import _ from 'lodash'
 import moment from 'moment'
 import 'moment/locale/nb'
 
+import { fixTz } from '../utils'
+
 moment.locale('nb')
 
 const eventOrganizersQuery = graphql`
@@ -27,10 +29,7 @@ const EventList = props => {
   const renderEvent = event => {
     const featuredMedia = event.featured_media
     const hasFeaturedMedia = featuredMedia && !!featuredMedia.localFile
-    /* TODO: Make API return proper UTC datetimes */
-    const startTimeNaive = event.start_time.replace('+00:00', '')
-    const utcOffset = 2
-    const start = moment.utc(startTimeNaive).utcOffset(utcOffset)
+    const start = fixTz(event.start_time)
     return (
       <Link to={event.path} className="event" key={event.id}>
         {hasFeaturedMedia && (
diff --git a/src/templates/event.js b/src/templates/event.js
index e47bdea..6afc7e5 100644
--- a/src/templates/event.js
+++ b/src/templates/event.js
@@ -7,6 +7,7 @@ import 'moment/locale/nb'
 
 import Meta from '../components/Meta'
 import Layout from '../components/Layout'
+import { fixTz } from '../utils'
 
 moment.locale('nb')
 
@@ -51,23 +52,8 @@ export const EventTemplate = ({
   organizers,
 }) => {
   const hasFeaturedMedia = featuredMedia && !!featuredMedia.localFile
-  /* TODO: Make API return proper UTC datetimes */
-  const startTimeNaive = startTime.replace("+00:00", "")
-  const endTimeNaive = endTime && endTime.replace("+00:00", "")
-  /*
-  const dst = moment(startTimeNaive).isDST()
-  const utcOffset = dst ? 2 : 2
-  */
-  /* looks like whatever we get above is always two hours behind! maybe.
-     at least this is true *now* if dst is true or false
-     did removing the TZ info from the string help?
-  */
-  /* TODO: does this change with server time when DST toggles?
-           if so, see you in October
-  */
-  const utcOffset = 2;
-  const start = moment.utc(startTimeNaive).utcOffset(utcOffset)
-  const end = endTimeNaive && moment.utc(endTimeNaive).utcOffset(utcOffset)
+  const start = fixTz(startTime)
+  const end = fixTz(endTime)
   return (
     <section className="event-page">
       <div className="event-hero">
@@ -91,9 +77,7 @@ export const EventTemplate = ({
                 <span className="event-date-weekday">
                   {start.format('dddd')}{' '}
                 </span>
-                <span className="event-date-day">
-                  {start.format('D.')}{' '}
-                </span>
+                <span className="event-date-day">{start.format('D.')} </span>
                 <span className="event-date-month">
                   {start.format('MMMM')}{' '}
                 </span>
@@ -137,11 +121,11 @@ export const EventTemplate = ({
                 {featuredMedia.localFile.childImageSharp ? (
                   <Img fluid={featuredMedia.localFile.childImageSharp.fluid} />
                 ) : (
-                    <img
-                      src={featuredMedia.localFile.publicURL}
-                      alt={featuredMedia.caption || ''}
-                    />
-                  )}
+                  <img
+                    src={featuredMedia.localFile.publicURL}
+                    alt={featuredMedia.caption || ''}
+                  />
+                )}
               </div>
               {/* {featuredMedia.caption && (
                 <div
@@ -210,10 +194,7 @@ const Event = ({ data }) => {
 
   return (
     <Layout>
-      <Meta
-        title={event.title}
-        image={event.featured_media}
-      />
+      <Meta title={event.title} image={event.featured_media} />
       <EventTemplate
         title={event.title}
         content={event.content}
diff --git a/src/utils.js b/src/utils.js
new file mode 100644
index 0000000..d8d0ff5
--- /dev/null
+++ b/src/utils.js
@@ -0,0 +1,26 @@
+import moment from 'moment'
+import 'moment/locale/nb'
+
+moment.locale('nb')
+
+export const fixTz = dt => {
+  /*
+  TODO:
+  Somewhere along the way, timezone information is lost.
+  Revisit when fetching data directly from WP using GraphQL?
+
+  Start time example
+    when DST: 2020-10-29T16:30:00+00:00
+    no DST:   2020-10-29T17:30:00+00:00
+    intended: 2020-10-29T18:30:00
+
+  Let's remove the bogus timezone info and add the UTC offset manually
+  */
+  if (!dt) {
+    return null
+  }
+  const naive = dt.replace('+00:00', '')
+  const dst = moment(naive).isDST()
+  const utcOffset = dst ? 2 : 1
+  return moment.utc(naive).utcOffset(utcOffset)
+}