diff --git a/Classes/HermesAppDelegate.m b/Classes/HermesAppDelegate.m
index 77975ef..eee11b5 100644
--- a/Classes/HermesAppDelegate.m
+++ b/Classes/HermesAppDelegate.m
@@ -178,6 +178,7 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
   NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
   [defaults registerDefaults:app_defaults];
   [self migrateDefaults:defaults];
+  [playback prepareFirst];
 }
 
 - (NSMenu *)applicationDockMenu:(NSApplication *)sender {
diff --git a/Classes/PlaybackController.h b/Classes/PlaybackController.h
index a7901d4..c4c4057 100644
--- a/Classes/PlaybackController.h
+++ b/Classes/PlaybackController.h
@@ -38,6 +38,7 @@
 - (void) playStation: (Station*) station;
 - (BOOL) saveState;
 - (void) show;
+- (void) prepareFirst;
 
 - (BOOL) play;
 - (BOOL) pause;
diff --git a/Classes/PlaybackController.m b/Classes/PlaybackController.m
index 5e23f52..e78ae83 100644
--- a/Classes/PlaybackController.m
+++ b/Classes/PlaybackController.m
@@ -87,15 +87,16 @@ - (id) init {
      selector:@selector(songPlayed:)
      name:@"song.playing"
      object:nil];
+  return self;
+}
 
+- (void) prepareFirst {
   int saved = [[NSUserDefaults standardUserDefaults]
                   integerForKey:@"hermes.volume"];
   if (saved == 0) {
     saved = 100;
   }
   [self setIntVolume:saved];
-
-  return self;
 }
 
 - (Pandora*) pandora {
@@ -110,7 +111,6 @@ - (void) reset {
   }
   playing = nil;
   lastImgSrc = nil;
-  [[NSUserDefaults standardUserDefaults] removeObjectForKey:@"hermes.volume"];
   NSString *path = [[NSApp delegate] stateDirectory:@"station.savestate"];
   [[NSFileManager defaultManager] removeItemAtPath:path error:nil];
 }
@@ -285,6 +285,7 @@ - (void) playStation: (Station*) station {
   } else {
     playOnStart = 1;
   }
+  [playing setVolume:[volume intValue]/100.0];
 }
 
 - (BOOL) play {